diff --git a/CHANGES b/CHANGES
index ce57b6b4a6..8e64f4163c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2.3.6rc8 to 2.3.6:
+  - Disable MS-output DID not found (Muhammad Hassan Ahmed) #12135
+
+
 2.3.6rc7 to 2.3.6rc8:
   - Revert "Add SiteList actions to transient statuses in ReqMgr2" (Alan Malta Rodrigues) #12133
   - Revert "Exclude RequestStatus from the returned values of get_modifiable_properties" (Alan Malta Rodrigues) #12132
diff --git a/src/python/WMCore/__init__.py b/src/python/WMCore/__init__.py
index 704ba8e756..6c26a02b0a 100644
--- a/src/python/WMCore/__init__.py
+++ b/src/python/WMCore/__init__.py
@@ -6,5 +6,5 @@
 
 """
 
-__version__ = '2.3.6rc8'
+__version__ = '2.3.6'
 __all__ = []