diff --git a/.unreleased/RELEASE_NOTES_HEADER.md.j2 b/.unreleased/RELEASE_NOTES_HEADER.md.j2
index f5d099f5626..66ac22aa130 100644
--- a/.unreleased/RELEASE_NOTES_HEADER.md.j2
+++ b/.unreleased/RELEASE_NOTES_HEADER.md.j2
@@ -7,7 +7,7 @@
 ## {{ release_current }} ({{ release_date }})
 
 This release contains performance improvements and bug fixes since
-the {{ release_previous }} release. We recommend that you upgrade at the next
+the {{ release_previous }} release. Best practice is to upgrade at the next
 available opportunity.
 
 In addition, it includes these noteworthy features:
diff --git a/.unreleased/pr_6978 b/.unreleased/pr_6978
deleted file mode 100644
index 5cdd0d09c06..00000000000
--- a/.unreleased/pr_6978
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #6978 Fix segfault in compress_chunk with primary space partition
diff --git a/.unreleased/pr_6992 b/.unreleased/pr_6992
deleted file mode 100644
index ec994f97bbd..00000000000
--- a/.unreleased/pr_6992
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes: #6975 Fix sort pushdown for partially compressed chunks
-Thanks: @srieding for reporting an issue with partially compressed chunks and ordering on joined columns
diff --git a/.unreleased/pr_6993 b/.unreleased/pr_6993
deleted file mode 100644
index a48483f3d46..00000000000
--- a/.unreleased/pr_6993
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #6993 Disallow hash partitioning on primary column 
diff --git a/.unreleased/pr_6996 b/.unreleased/pr_6996
deleted file mode 100644
index e61d10d3ecd..00000000000
--- a/.unreleased/pr_6996
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes: #6976 Fix removal of metadata function and update script
-Thanks: @gugu for reporting the issue with catalog corruption due to update
diff --git a/.unreleased/template.release_notes_header.j2 b/.unreleased/template.release_notes_header.j2
index f5d099f5626..66ac22aa130 100644
--- a/.unreleased/template.release_notes_header.j2
+++ b/.unreleased/template.release_notes_header.j2
@@ -7,7 +7,7 @@
 ## {{ release_current }} ({{ release_date }})
 
 This release contains performance improvements and bug fixes since
-the {{ release_previous }} release. We recommend that you upgrade at the next
+the {{ release_previous }} release. Best practice is to upgrade at the next
 available opportunity.
 
 In addition, it includes these noteworthy features:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ad442cb81f..b223ed71d54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,27 @@
 `psql` with the `-X` flag to prevent any `.psqlrc` commands from
 accidentally triggering the load of a previous DB version.**
 
+## 2.15.2 (2024-06-07)
+
+This release contains  bug fixes since the 2.15.1 release.
+Best practice is to upgrade at the next available opportunity.
+
+**Migrating from self-hosted TimescaleDB v2.14.x and earlier**
+
+After you run `ALTER EXTENSION`, you must run [this SQL script](https://github.com/timescale/timescaledb-extras/blob/master/utils/2.15.X-fix_hypertable_foreign_keys.sql). For more details, see the following pull request [#6797](https://github.com/timescale/timescaledb/pull/6797).
+
+If you are migrating from TimescaleDB v2.15.0 or v2.15.1, no changes are required.
+
+**Bugfixes**
+* #6975: Fix sort pushdown for partially compressed chunks.
+* #6976: Fix removal of metadata function and the update script.
+* #6978: Fix segfault in `compress_chunk` with a primary space partition.
+* #6993: Disallow hash partitioning on the primary column.
+
+**Thanks**
+* @gugu for reporting the issue with catalog corruption due to update.
+* @srieding for reporting the issue with partially compressed chunks and ordering on joined columns.
+
 ## 2.15.1 (2024-05-28)
 
 This release contains performance improvements and bug fixes since
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index b9d9c2420e1..ef0280249bb 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -47,11 +47,12 @@ set(MOD_FILES
     updates/2.14.0--2.14.1.sql
     updates/2.14.1--2.14.2.sql
     updates/2.14.2--2.15.0.sql
-    updates/2.15.0--2.15.1.sql)
+    updates/2.15.0--2.15.1.sql
+    updates/2.15.1--2.15.2.sql)
 
 # The downgrade file to generate a downgrade script for the current version, as
 # specified in version.config
-set(CURRENT_REV_FILE 2.15.1--2.15.0.sql)
+set(CURRENT_REV_FILE 2.15.2--2.15.1.sql)
 # Files for generating old downgrade scripts. This should only include files for
 # downgrade from one version to its previous version since we do not support
 # skipping versions when downgrading.
@@ -90,7 +91,8 @@ set(OLD_REV_FILES
     2.14.1--2.14.0.sql
     2.14.2--2.14.1.sql
     2.15.0--2.14.2.sql
-    2.15.1--2.15.0.sql)
+    2.15.1--2.15.0.sql
+    2.15.2--2.15.1.sql)
 
 set(MODULE_PATHNAME "$libdir/timescaledb-${PROJECT_VERSION_MOD}")
 set(LOADER_PATHNAME "$libdir/timescaledb")
diff --git a/sql/updates/2.15.1--2.15.2.sql b/sql/updates/2.15.1--2.15.2.sql
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/sql/updates/2.15.2--2.15.1.sql b/sql/updates/2.15.2--2.15.1.sql
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/version.config b/version.config
index bb6485dcd9b..e78132be7c6 100644
--- a/version.config
+++ b/version.config
@@ -1,3 +1,3 @@
-version = 2.15.1
-update_from_version = 2.15.0
-downgrade_to_version = 2.15.0
+version = 2.15.2
+update_from_version = 2.15.1
+downgrade_to_version = 2.15.1