diff --git a/CHANGELOG b/CHANGELOG
index 643f6038f..06d0cfa85 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+mkdocs-material-9.5.18 (2024-04-16)
+
+  * Refactored tooltips implementation to fix positioning issues
+  * Fixed #7044: Rendering glitch when hovering contributor avatar in Chrome
+  * Fixed #7043: Highlighted lines in code blocks cutoff on mobile
+  * Fixed #6910: Incorrect position of tooltip for page status in sidebar
+  * Fixed #6760: Incorrect position and overly long tooltip in tables
+  * Fixed #6488: Incorrect position and cutoff tooltip in content tabs
+
 mkdocs-material-9.5.17+insiders-4.53.6 (2024-04-05)
 
   * Ensure working directory is set for projects when using projects plugin
diff --git a/docs/changelog/index.md b/docs/changelog/index.md
index 7aa689a58..027840cb9 100644
--- a/docs/changelog/index.md
+++ b/docs/changelog/index.md
@@ -2,6 +2,15 @@
 
 ## Material for MkDocs
 
+### 9.5.18 <small>April 16, 2024</small> { id="9.5.18" }
+
+- Refactored tooltips implementation to fix positioning issues
+- Fixed #7044: Rendering glitch when hovering contributor avatar in Chrome
+- Fixed #7043: Highlighted lines in code blocks cutoff on mobile
+- Fixed #6910: Incorrect position of tooltip for page status in sidebar
+- Fixed #6760: Incorrect position and overly long tooltip in tables
+- Fixed #6488: Incorrect position and cutoff tooltip in content tabs
+
 ### 9.5.17 <small>April 2, 2024</small> { id="9.5.17" }
 
 - Updated Serbian translations
diff --git a/material/__init__.py b/material/__init__.py
index d3d04577c..60afc5512 100644
--- a/material/__init__.py
+++ b/material/__init__.py
@@ -18,4 +18,4 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-__version__ = "9.5.17"
+__version__ = "9.5.18"
diff --git a/material/templates/base.html b/material/templates/base.html
index deb45a91e..22b436081 100644
--- a/material/templates/base.html
+++ b/material/templates/base.html
@@ -32,7 +32,7 @@
         <link rel="alternate" type="application/rss+xml" title="{{ lang.t('rss.updated') }}" href="{{ 'feed_rss_updated.xml' | url }}">
       {% endif %}
       <link rel="icon" href="{{ config.theme.favicon | url }}">
-      <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-9.5.17">
+      <meta name="generator" content="mkdocs-{{ mkdocs_version }}, mkdocs-material-9.5.18">
     {% endblock %}
     {% block htmltitle %}
       {% if page.meta and page.meta.title %}
diff --git a/package-lock.json b/package-lock.json
index 9da306332..cc9837735 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "mkdocs-material",
-  "version": "9.5.17",
+  "version": "9.5.18",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "mkdocs-material",
-      "version": "9.5.17",
+      "version": "9.5.18",
       "license": "MIT",
       "dependencies": {
         "clipboard": "^2.0.11",
diff --git a/package.json b/package.json
index 7839e7053..3ab19b0c6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mkdocs-material",
-  "version": "9.5.17",
+  "version": "9.5.18",
   "description": "Documentation that simply works",
   "keywords": [
     "mkdocs",