diff --git a/.unreleased/PR_6117 b/.unreleased/PR_6117
deleted file mode 100644
index 7bb591cadaa..00000000000
--- a/.unreleased/PR_6117
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #6117 Avoid decompressing batches using an empty slot
diff --git a/.unreleased/pr_6113 b/.unreleased/pr_6113
deleted file mode 100644
index 80ba723f5f5..00000000000
--- a/.unreleased/pr_6113
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixes: #6113 Fix planner distributed table count
-
-Thanks: @symbx for reporting a crash when selecting from empty hypertables
diff --git a/.unreleased/pr_6142 b/.unreleased/pr_6142
deleted file mode 100644
index 72573583827..00000000000
--- a/.unreleased/pr_6142
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #6142 do not throw an error when deprecation GUC cannot be read
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8368223b5ee..a06b4cbf493 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,19 @@
 `psql` with the `-X` flag to prevent any `.psqlrc` commands from
 accidentally triggering the load of a previous DB version.**
 
+## 2.12.1 (2023-10-11)
+
+This release contains bug fixes since the 2.12.0 release.
+We recommend that you upgrade at the next available opportunity.
+
+**Bugfixes**
+* #6113 Fix planner distributed table count
+* #6117 Avoid decompressing batches using an empty slot
+* #6123 Fix concurrency errors in OSM API
+* #6142 do not throw an error when deprecation GUC cannot be read
+**Thanks**
+* @symbx for reporting a crash when selecting from empty hypertables
+
 ## 2.12.0 (2023-09-27)
 
 This release contains performance improvements for compressed hypertables
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index fe48dc34547..fb02c25b5da 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -38,7 +38,8 @@ set(MOD_FILES
     updates/2.10.3--2.11.0.sql
     updates/2.11.0--2.11.1.sql
     updates/2.11.1--2.11.2.sql
-    updates/2.11.2--2.12.0.sql)
+    updates/2.11.2--2.12.0.sql
+    updates/2.12.0--2.12.1.sql)
 
 # The downgrade file to generate a downgrade script for the current version, as
 # specified in version.config
diff --git a/sql/updates/2.12.0-2.12.1.sql b/sql/updates/2.12.0-2.12.1.sql
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/version.config b/version.config
index de0b910d5ff..c404e0c0af5 100644
--- a/version.config
+++ b/version.config
@@ -1,3 +1,3 @@
 version = 2.13.0-dev
-update_from_version = 2.12.0
+update_from_version = 2.12.1
 downgrade_to_version = 2.12.0