diff --git a/CHANGELOG b/CHANGELOG
index 7bdcf927a..ccd1fd328 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+mkdocs-material-8.5.4 (2022-09-30)
+
+  * Fixed expand icons shift on sidebar overflow (using scrollbar-gutter)
+  * Fixed #4429: Text in sequence diagrams overflows in Firefox
+
 mkdocs-material-8.5.3+insiders-4.24.0 (2022-09-27)
 
   * Added support for custom content on index pages (blog)
diff --git a/docs/changelog/index.md b/docs/changelog/index.md
index 759d26bc9..5e58ad543 100644
--- a/docs/changelog/index.md
+++ b/docs/changelog/index.md
@@ -6,6 +6,11 @@ template: overrides/main.html
 
 ## Material for MkDocs
 
+### 8.5.4 <small>_ September 30, 2022</small> { id="8.5.4" }
+
+- Fixed expand icons shift on sidebar overflow (using `scrollbar-gutter`)
+- Fixed #4429: Text in sequence diagrams overflows in Firefox
+
 ### 8.5.3 <small>_ September 20, 2022</small> { id="8.5.3" }
 
 - Fixed build error when enabling cookie consent without analytics
diff --git a/material/base.html b/material/base.html
index 20ab1861f..05c90d8c8 100644
--- a/material/base.html
+++ b/material/base.html
@@ -22,7 +22,7 @@
         <link rel="canonical" href="{{ page.canonical_url }}">
       {% endif %}
       <link rel="icon" href="{{ config.theme.favicon | url }}">
-      <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-8.5.3">
+      <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-8.5.4">
     {% endblock %}
     {% block htmltitle %}
       {% if page.meta and page.meta.title %}
diff --git a/package-lock.json b/package-lock.json
index 908426723..7b395ed23 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mkdocs-material",
-  "version": "8.5.3",
+  "version": "8.5.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mkdocs-material",
-      "version": "8.5.3",
+      "version": "8.5.4",
       "license": "MIT",
       "dependencies": {
         "array-flat-polyfill": "^1.0.1",
diff --git a/package.json b/package.json
index 25d74db10..b42ea1d0b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mkdocs-material",
-  "version": "8.5.3",
+  "version": "8.5.4",
   "description": "Documentation that simply works",
   "keywords": [
     "mkdocs",