diff --git a/conf.py b/conf.py
index 838b90ee42..8ea91b6697 100644
--- a/conf.py
+++ b/conf.py
@@ -94,7 +94,7 @@ def __getattr__(cls, name):
 # The short X.Y version.
 version = '8.6'
 # The full version, including alpha/beta/rc tags.
-release = '8.6.3'
+release = '8.6.4'
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #language = None
diff --git a/en/MIGRATION_GUIDE.txt b/en/MIGRATION_GUIDE.txt
index 5b12959304..0b844b3b64 100644
--- a/en/MIGRATION_GUIDE.txt
+++ b/en/MIGRATION_GUIDE.txt
@@ -22,6 +22,11 @@ MapServer Migration Guide
 MapServer 8.4 to 8.6 Migration
 ==============================
 
+- The 8.6.4 release includes fixes for two vulnerabilities, see the advisories:
+  
+  - `OpenLayers viewer with WMS <https://github.com/MapServer/MapServer/security/advisories/GHSA-xqj6-vjqr-33vv>`__ advisory
+  - `PostGIS support <https://github.com/MapServer/MapServer/security/advisories/GHSA-xp29-8wp5-wc3p>`__ advisory
+
 - The 8.6.3 release includes a fix for a vulnerability in the SLD parser  
   (see MapServer's `Security Advisory <https://github.com/MapServer/MapServer/security/advisories/GHSA-4h8g-378q-r75m>`__)
   
diff --git a/en/announcements/announcements_archive.txt b/en/announcements/announcements_archive.txt
index 91d1b9ea6a..e15290096d 100644
--- a/en/announcements/announcements_archive.txt
+++ b/en/announcements/announcements_archive.txt
@@ -4,6 +4,26 @@
  MapServer Announcement Archives
 *****************************************************************************
 
+**2026-06-01 - MapServer 8.6.4 is released**
+
+.. important::  
+   Security release available
+
+The security release of MapServer 8.6.4 has been issued in order to fix
+two vulnerabilities. See the :ref:`changelog <changelog-8-6-4>` 
+for the list of changes. 
+You may also review the security advisories for this release:
+
+1. `OpenLayers viewer with WMS <https://github.com/MapServer/MapServer/security/advisories/GHSA-xqj6-vjqr-33vv>`__ advisory
+2. `PostGIS support <https://github.com/MapServer/MapServer/security/advisories/GHSA-xp29-8wp5-wc3p>`__ advisory
+ 
+You may also review MapServer's `Security Policy <https://github.com/MapServer/MapServer/blob/main/SECURITY.md>`__.
+As security for the 7.6 branch has ended, and branches 8.4, 8.2 & 8.0 are not supported, 
+all users are strongly encouraged to upgrade to the MapServer 8.6.4 release (see the 
+:ref:`Migration Guide <migration>`).
+
+Head to :ref:`download` to obtain a copy.
+
 **2026-05-07 - MapServer 8.6.3 is released**
 
 .. important::  
diff --git a/en/development/changelog/changelog-8-6.txt b/en/development/changelog/changelog-8-6.txt
index 74db82380a..6b9e32cdc3 100644
--- a/en/development/changelog/changelog-8-6.txt
+++ b/en/development/changelog/changelog-8-6.txt
@@ -7,6 +7,17 @@
 The summary of major changes for this release can be found in the `HISTORY.md <https://github.com/MapServer/MapServer/blob/branch-8-6/HISTORY.md>`__
 file from the source directory.
 
+.. _changelog-8-6-4:
+
+Changes from 8.6.3 to 8.6.4
+===========================
+
+* PostGIS: make sure identifier value is numeric when the declared type is numeric too ( `#7519 <https://github.com/mapserver/mapserver/issues/7519>`__ ) (Even Rouault) : `65f1b53 <https://github.com/mapserver/mapserver/commit/65f1b53c258df2abdf6ce1f437c29e75e9976247>`__
+* WMS OpenLayers output: properly escape mapserv_onlineresource ( `#7518 <https://github.com/mapserver/mapserver/issues/7518>`__ ) (Even Rouault) : `ff17ef1 <https://github.com/mapserver/mapserver/commit/ff17ef190caaeaa9002ac3d1c7969ec5315c345e>`__
+* cgiutil: fix handling of malformed percent-encoding ( `#7515 <https://github.com/mapserver/mapserver/issues/7515>`__ ) (Stefan Gloor) : `6364c71 <https://github.com/mapserver/mapserver/commit/6364c71bff48d669fd62866ad52e2b1292f23da9>`__
+* PostGIS: fix wfs_use_default_extent_for_getfeature=false and PROCESSING=NATIVE_FILTER ( `#7514 <https://github.com/mapserver/mapserver/issues/7514>`__ ) (Even Rouault) : `6bb14b2 <https://github.com/mapserver/mapserver/commit/6bb14b222fc17ac5d6e322faff85010e81104288>`__
+* Fix incorrect JSON error message output on Index Pages ( `#7513 <https://github.com/mapserver/mapserver/issues/7513>`__ ) (Seth Girvin) : `7f18840 <https://github.com/mapserver/mapserver/commit/7f188405d7a46291206911d853189cb4c09cb38f>`__
+
 .. _changelog-8-6-3:
 
 Changes from 8.6.2 to 8.6.3
diff --git a/en/include/announcements.inc b/en/include/announcements.inc
index d6741220ab..5a788c9c11 100644
--- a/en/include/announcements.inc
+++ b/en/include/announcements.inc
@@ -1,3 +1,23 @@
+**2026-06-01 - MapServer 8.6.4 is released**
+
+.. important::  
+   Security release available
+
+The security release of MapServer 8.6.4 has been issued in order to fix
+two vulnerabilities. See the :ref:`changelog <changelog-8-6-4>` 
+for the list of changes. 
+You may also review the security advisories for this release:
+
+1. `OpenLayers viewer with WMS <https://github.com/MapServer/MapServer/security/advisories/GHSA-xqj6-vjqr-33vv>`__ advisory
+2. `PostGIS support <https://github.com/MapServer/MapServer/security/advisories/GHSA-xp29-8wp5-wc3p>`__ advisory
+ 
+You may also review MapServer's `Security Policy <https://github.com/MapServer/MapServer/blob/main/SECURITY.md>`__.
+As security for the 7.6 branch has ended, and branches 8.4, 8.2 & 8.0 are not supported, 
+all users are strongly encouraged to upgrade to the MapServer 8.6.4 release (see the 
+:ref:`Migration Guide <migration>`).
+
+Head to :ref:`download` to obtain a copy.
+
 **2026-05-07 - MapServer 8.6.3 is released**
 
 .. important::