diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29fc3ddc98d..a6ddf9900cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX ${CMAKE_CURRENT_SOURCE_DIR}/CMake/cxx_fla
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version")
 
 project(AGS
-    VERSION 3.6.0.52
+    VERSION 3.6.0.53
     LANGUAGES CXX C)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
diff --git a/Changes.txt b/Changes.txt
index a849f6381fb..1845ca75891 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -1,5 +1,37 @@
 REVISION HISTORY
 ================
+VERSION 3.6.0 - Patch 6, November 2023
+
+Editor:
+ - Fixed GUI editor could display selection rectangle from a different GUI editor pane,
+   if two or more are displayed on screen at the same time.
+ - Fixed "autoptr" and "builtin" keywords not colored as valid keywords in the script editor.
+ - Fixed character literals in a script editor having wrong colors when a Color Theme is applied.
+   
+Engine:
+ - Made String.Chars and Length properties work faster in ASCII mode.
+ - Issue a warning when blocking Display or Say commands are called during fade-out.
+ - Fixed engine failing to startup sometimes if controller device subsystem failed to init
+   (it should not init at all in this version, as we do not support joysticks yet).
+ - Fixed "Before fade-in" event could be called recursively under some peculiar conditions
+   (regression since 3.6.0).
+ - Fixed buttons on a non-clickable GUI were still changing to "mouse over" graphic under cursor.
+ - Fixed button click not registered if it has been made not visible and visible again during a
+   single game frame (regression since 3.6.0).
+ - Fixed TextWindow borders drawn behind the rightmost corner pieces, which may be seen if the
+   edge sprites are half-transparent.
+ - Fixed a brief black screen flash occuring right after the video playback ends
+   (regression since 3.6.0).
+ - Fixed engine refusing to load legacy saves if the audio clip count does not match
+   (number of audio clips should not affect saves).
+   
+WinSetup:
+ - Added an option to disable "smooth scaled sprites" setting.
+ - Added an option to disable language selection.
+ - Made filter names in "disabled" section treated in case insensitive way.
+
+
+
 VERSION 3.6.0 - Patch 5, September 2023
 
 Editor:
diff --git a/Common/core/def_version.h b/Common/core/def_version.h
index 94058a60ccb..ffc137b38ec 100644
--- a/Common/core/def_version.h
+++ b/Common/core/def_version.h
@@ -1,9 +1,9 @@
 #ifndef __AGS_CN_CORE__DEFVERSION_H
 #define __AGS_CN_CORE__DEFVERSION_H
 
-#define ACI_VERSION_STR      "3.6.0.52"
+#define ACI_VERSION_STR      "3.6.0.53"
 #if defined (RC_INVOKED) // for MSVC resource compiler
-#define ACI_VERSION_MSRC_DEF  3,6,0,52
+#define ACI_VERSION_MSRC_DEF  3,6,0,53
 #endif
 
 #define SPECIAL_VERSION ""
diff --git a/Editor/AGS.Editor/app.manifest b/Editor/AGS.Editor/app.manifest
index 81bdbccc0ad..46731aa4e76 100644
--- a/Editor/AGS.Editor/app.manifest
+++ b/Editor/AGS.Editor/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="3.6.0.52" name="AGSEditor"/>
+  <assemblyIdentity version="3.6.0.53" name="AGSEditor"/>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
diff --git a/Editor/AGS.Types/Properties/AssemblyInfo.cs b/Editor/AGS.Types/Properties/AssemblyInfo.cs
index 7fca665cb4f..b516eb6849f 100644
--- a/Editor/AGS.Types/Properties/AssemblyInfo.cs
+++ b/Editor/AGS.Types/Properties/AssemblyInfo.cs
@@ -22,9 +22,9 @@ namespace AGS.Types
     public class Version
     {
         public static readonly bool IS_BETA_VERSION = false;
-        public const string AGS_EDITOR_DATE = "September 2023";
+        public const string AGS_EDITOR_DATE = "November 2023";
         public const string AGS_EDITOR_FRIENDLY_VERSION = "3.6.0";
-        public const string AGS_EDITOR_VERSION = "3.6.0.52";
+        public const string AGS_EDITOR_VERSION = "3.6.0.53";
         public const string AGS_EDITOR_COPYRIGHT = "Copyright © 2006-2011 Chris Jones and 2011-2023 others.";
     }
 }
diff --git a/version.json b/version.json
index ae995d3d67d..bdc346db2dc 100644
--- a/version.json
+++ b/version.json
@@ -1,9 +1,9 @@
 {
-    "version": "3.6.0.52",
+    "version": "3.6.0.53",
     "versionFriendly": "3.6.0",
-    "versionSp": "P5",
+    "versionSp": "P6",
     "versionYear": "2023",
-    "versionMonth": "September",
+    "versionMonth": "November",
     "versionIsBeta": "false",
     "appID": "a4d6de0f-18b0-4aae-9338-86a333563b98"
 }
\ No newline at end of file