diff --git a/changelog.rst b/changelog.rst
index 1a17442f..f5649a09 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -1,7 +1,28 @@
 ZoiteChat ChangeLog
 =================
 
+2.18.1 (2026-05-21)
+-------------------
+
+- Migrated D-Bus handling to GDBus.
+- Enabled mouse wheel channel switching by default and consumed handled tab wheel events.
+- Switched main panes to native GTK scrollbars.
+- Tightened userlist button and meter layout.
+- Made the native Windows file chooser modal.
+- Set the Windows AppUserModelID before GTK startup.
+- Updated Windows CI to use the new GTK3 bundle zip.
+- Updated Windows installer architecture checks to use x64-compatible detection.
+- Bumped the Flatpak Perl runtime to 5.42.2.
+- Fixed palette color reads to preserve base GTK state.
+- Fixed auto-replace whole-word matching.
+- Fixed checksum file stream cleanup.
+- Fixed byte handling in the Python console.
+- Guarded GTK drag-and-drop handlers against null windows.
+- Fixed size_t and integer handling issues.
+- Removed the Winamp plugin.
+
 2.18.0 (2026-04-20)
+-------------------
 
 - Added optional close buttons on tabs.
 - Added Ctrl+W to close tabs and Ctrl+Shift+T to reopen recently closed tabs.
@@ -19,6 +40,7 @@ ZoiteChat ChangeLog
 - Improved AppStream metainfo validation.
 
 2.18.0~pre6 (2026-03-30)
+------------------------
 
 - Applied app theme CSS to the menubar consistently across the app.
 - Restored horizontal separator lines in menus.
diff --git a/data/misc/net.zoite.Zoitechat.appdata.xml.in b/data/misc/net.zoite.Zoitechat.appdata.xml.in
index 8591af24..ae3321ab 100644
--- a/data/misc/net.zoite.Zoitechat.appdata.xml.in
+++ b/data/misc/net.zoite.Zoitechat.appdata.xml.in
@@ -29,6 +29,28 @@
     <id>zoitechat.desktop</id>
   </provides>
 <releases>
+<release date="2026-05-21" version="2.18.1">
+  <description>
+    <ul>
+      <li>Migrated D-Bus handling to GDBus.</li>
+      <li>Enabled mouse wheel channel switching by default and consumed handled tab wheel events.</li>
+      <li>Switched main panes to native GTK scrollbars.</li>
+      <li>Tightened userlist button and meter layout.</li>
+      <li>Made the native Windows file chooser modal.</li>
+      <li>Set the Windows AppUserModelID before GTK startup.</li>
+      <li>Updated Windows CI to use the new GTK3 bundle zip.</li>
+      <li>Updated Windows installer architecture checks to use x64-compatible detection.</li>
+      <li>Bumped the Flatpak Perl runtime to 5.42.2.</li>
+      <li>Fixed palette color reads to preserve base GTK state.</li>
+      <li>Fixed auto-replace whole-word matching.</li>
+      <li>Fixed checksum file stream cleanup.</li>
+      <li>Fixed byte handling in the Python console.</li>
+      <li>Guarded GTK drag-and-drop handlers against null windows.</li>
+      <li>Fixed size_t and integer handling issues.</li>
+      <li>Removed the Winamp plugin.</li>
+    </ul>
+  </description>
+</release>
 <release date="2026-04-20" version="2.18.0">
   <description>
     <p>Tabs and navigation:</p>
diff --git a/meson.build b/meson.build
index 3966c442..ffcfd62f 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('zoitechat', 'c',
-  version: '2.18.0',
+  version: '2.18.1',
   meson_version: '>= 0.55.0',
   default_options: [
     'c_std=c17',
diff --git a/plugins/python/python.py b/plugins/python/python.py
index da52d97e..ca0d5f25 100644
--- a/plugins/python/python.py
+++ b/plugins/python/python.py
@@ -19,7 +19,7 @@ else:
 if not hasattr(sys, 'argv'):
     sys.argv = ['<zoitechat>']
 
-VERSION = b'2.18.0'
+VERSION = b'2.18.1'
 PLUGIN_NAME = ffi.new('char[]', b'Python')
 PLUGIN_DESC = ffi.new('char[]', b'Python %d.%d scripting interface' % (sys.version_info[0], sys.version_info[1]))
 PLUGIN_VERSION = ffi.new('char[]', VERSION)
diff --git a/win32/version.txt b/win32/version.txt
index cf869073..a36e9b09 100644
--- a/win32/version.txt
+++ b/win32/version.txt
@@ -1 +1 @@
-2.18.0
+2.18.1