diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbce863f66..a23b147b3c 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.1.22
+    VERSION 3.6.1.23
     LANGUAGES CXX C)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
diff --git a/Changes.txt b/Changes.txt
index 6272cf4978..8227a5296e 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -1,5 +1,22 @@
 REVISION HISTORY
 ================
+VERSION 3.6.1 - Patch 1, April 2024
+
+Editor:
+ - Fixed View's frame preview sometimes drawn incorrectly, in case of certain panel sizes.
+ - Fixed folding in the script editor not working correctly if there's a commented closing
+   bracket ("//}") inside this code section.
+ - Fixed Editor sometimes failing to update game exe's file information and/or icons, if
+   user was importing any sprites during this working session.
+
+Engine:
+ - Fixed room objects not updating under Direct3D/OpenGL renderer, if they were assigned a dynamic
+   sprite, then that sprite was deleted, and a new one assigned with coincidentally same ID.
+ - Fixed room objects not updating under Software renderer, if they were assigned a dynamic sprite,
+   and that sprite was modified while object was not visible on screen.
+ - Fixed inventory cursor's crosshair not displayed (when enabled in game settings).
+
+
 VERSION 3.6.1, April 2024
 
 Common features:
diff --git a/Common/core/def_version.h b/Common/core/def_version.h
index 33e67994fe..d53082f92a 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.1.22"
+#define ACI_VERSION_STR      "3.6.1.23"
 #if defined (RC_INVOKED) // for MSVC resource compiler
-#define ACI_VERSION_MSRC_DEF  3,6,1,22
+#define ACI_VERSION_MSRC_DEF  3,6,1,23
 #endif
 
 #define SPECIAL_VERSION ""
diff --git a/Editor/AGS.Editor/app.manifest b/Editor/AGS.Editor/app.manifest
index d29aac9cf9..b24d620cb2 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.1.22" name="AGSEditor"/>
+  <assemblyIdentity version="3.6.1.23" 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 ae4199b4f2..dddd6d8f65 100644
--- a/Editor/AGS.Types/Properties/AssemblyInfo.cs
+++ b/Editor/AGS.Types/Properties/AssemblyInfo.cs
@@ -24,7 +24,7 @@ public class Version
         public static readonly bool IS_BETA_VERSION = false;
         public const string AGS_EDITOR_DATE = "April 2024";
         public const string AGS_EDITOR_FRIENDLY_VERSION = "3.6.1";
-        public const string AGS_EDITOR_VERSION = "3.6.1.22";
+        public const string AGS_EDITOR_VERSION = "3.6.1.23";
         public const string AGS_EDITOR_COPYRIGHT = "Copyright © 2006-2011 Chris Jones and 2011-2024 others.";
     }
 }
diff --git a/version.json b/version.json
index 1e91883bd9..debe453462 100644
--- a/version.json
+++ b/version.json
@@ -1,7 +1,7 @@
 {
-    "version": "3.6.1.22",
+    "version": "3.6.1.23",
     "versionFriendly": "3.6.1",
-    "versionSp": "",
+    "versionSp": "P1",
     "versionYear": "2024",
     "versionMonth": "April",
     "versionIsBeta": "false",