diff --git a/CHANGELOG b/CHANGELOG
index ce9ac7d8f..00393b88d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+mkdocs-material-8.2.5 (2022-03-06)
+
+  * Fixed #3596: Mermaid not working when headline with name 'Mermaid' present
+  * Fixed #3643: Reduce time to render pages with thousands of code blocks
+  * Fixed #3665: Missing styles for Mermaid.js flowcharts cluster labels
+
 mkdocs-material-8.2.4+insiders-4.10.1 (2022-03-02)
 
   * Added missing build dependencies to Dockerfile
diff --git a/docs/changelog/index.md b/docs/changelog/index.md
index dd5a0266e..ea935a3e5 100644
--- a/docs/changelog/index.md
+++ b/docs/changelog/index.md
@@ -6,6 +6,12 @@ template: overrides/main.html
 
 ## Material for MkDocs
 
+### 8.2.5 <small>_ March 6, 2022</small> { id="8.2.5" }
+
+- Fixed #3596: Mermaid not working when headline with name 'Mermaid' present
+- Fixed #3643: Reduce time to render pages with thousands of code blocks
+- Fixed #3665: Missing styles for Mermaid.js flowcharts cluster labels
+
 ### 8.2.4 <small>_ March 2, 2022</small> { id="8.2.4" }
 
 - Fixed malformed Google Fonts URL when a font setting was omitted
diff --git a/material/base.html b/material/base.html
index 7ad375d80..5687c44eb 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.2.4">
+      <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-8.2.5">
     {% endblock %}
     {% block htmltitle %}
       {% if page and page.meta and page.meta.title %}
diff --git a/package-lock.json b/package-lock.json
index 90a3dd3bd..528af2382 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mkdocs-material",
-  "version": "8.2.4",
+  "version": "8.2.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mkdocs-material",
-      "version": "8.2.4",
+      "version": "8.2.5",
       "license": "MIT",
       "dependencies": {
         "array-flat-polyfill": "^1.0.1",
diff --git a/package.json b/package.json
index 71fdbdab2..c98509b7c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mkdocs-material",
-  "version": "8.2.4",
+  "version": "8.2.5",
   "description": "A Material Design theme for MkDocs",
   "keywords": [
     "mkdocs",