diff --git a/changelog.rst b/changelog.rst
index f5649a09..8d2317d6 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -1,6 +1,24 @@
 ZoiteChat ChangeLog
 =================
 
+2.18.2 (2026-06-20)
+-------------------
+
+- Improved security and connection handling with stronger TLS defaults, 
+  safer certificate/hostname validation, FiSHLiM OpenSSL fixes, keyring support, 
+  and getaddrinfo-based DCC lookups.
+- Expanded FiSHLiM usability with a GTK key manager, context-menu access, and clearer
+  channel/private-message key handling.
+- Improved keyboard and navigation behavior with customizable keybinds, reset support,
+  channel-name switching, /server -noproxy, and configurable stale-link ping checks.
+- Refined the GTK interface with native file chooser dialogs, topic layout preferences, 
+  timestamp/date hover tooltips, better restore-down relayout, text scroll speed controls, 
+  and aligned network meters.
+- Added privacy and display options, including hiding join/part hostmasks and improved 
+  topic/multiline mode layout controls.
+- Fixed several platform/UI edge cases, including tray restore from iconified state, DBus unload
+  handling, GTK3 theme refresh/saving, and tab switcher compatibility.
+
 2.18.1 (2026-05-21)
 -------------------
 
diff --git a/data/misc/net.zoite.Zoitechat.appdata.xml.in b/data/misc/net.zoite.Zoitechat.appdata.xml.in
index ae3321ab..d213bd98 100644
--- a/data/misc/net.zoite.Zoitechat.appdata.xml.in
+++ b/data/misc/net.zoite.Zoitechat.appdata.xml.in
@@ -29,6 +29,29 @@
     <id>zoitechat.desktop</id>
   </provides>
 <releases>
+<release date="2026-06-20" version="2.18.2">
+  <description>
+    <p>Security and connections:</p>
+    <ul>
+      <li>Improved TLS, certificate and hostname validation, FiSHLiM OpenSSL handling, keyring support, and DCC host lookups.</li>
+    </ul>
+    <p>FiSHLiM:</p>
+    <ul>
+      <li>Added a GTK key manager with context-menu access and clearer channel/private-message key handling.</li>
+    </ul>
+    <p>Interface and preferences:</p>
+    <ul>
+      <li>Improved keybind customization, reset support, channel-name switching, <code>/server -noproxy</code>, and stale-link ping checks.</li>
+      <li>Refined GTK behavior with native file choosers, topic layout preferences, timestamp/date tooltips, text scroll controls, and aligned network meters.</li>
+      <li>Added privacy and display options for hiding join/part hostmasks and controlling topic/multiline layout.</li>
+    </ul>
+    <p>Fixes:</p>
+    <ul>
+      <li>Fixed tray restore, DBus unload handling, GTK3 theme refresh/saving, topic relayout, and tab switcher compatibility.</li>
+      <li>Updated project documentation.</li>
+    </ul>
+  </description>
+</release>
 <release date="2026-05-21" version="2.18.1">
   <description>
     <ul>
diff --git a/meson.build b/meson.build
index 289ca541..1b7b6667 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('zoitechat', 'c',
-  version: '2.18.1',
+  version: '2.18.2',
   meson_version: '>= 0.55.0',
   default_options: [
     'c_std=c17',
diff --git a/packaging/fedora/zoitechat.spec b/packaging/fedora/zoitechat.spec
index 0f17b2ba..3c1cd08f 100644
--- a/packaging/fedora/zoitechat.spec
+++ b/packaging/fedora/zoitechat.spec
@@ -1,5 +1,5 @@
 Name:           zoitechat
-Version:        2.18.1
+Version:        2.18.2
 Release:        %autorelease
 Summary:        HexChat-based IRC client
 License:        GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception
diff --git a/plugins/python/python.py b/plugins/python/python.py
index ca0d5f25..df243ae7 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.1'
+VERSION = b'2.18.2'
 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 a36e9b09..61dc3342 100644
--- a/win32/version.txt
+++ b/win32/version.txt
@@ -1 +1 @@
-2.18.1
+2.18.2