diff --git a/.unreleased/pr_7335 b/.unreleased/pr_7335
deleted file mode 100644
index bf09af3d591..00000000000
--- a/.unreleased/pr_7335
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes: #7335 Change log level used in compression
-Thanks: @gmilamjr for reporting an issue with the log level of compression messages
diff --git a/.unreleased/pr_7345 b/.unreleased/pr_7345
deleted file mode 100644
index 611f6224ac6..00000000000
--- a/.unreleased/pr_7345
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes: #7342 Fix collation for in-memory tuple filtering
-Thanks: @hackbnw for reporting an issue with collation during tuple filtering
diff --git a/.unreleased/pr_7360 b/.unreleased/pr_7360
deleted file mode 100644
index d410c43c8f7..00000000000
--- a/.unreleased/pr_7360
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #7360 Add chunk skipping GUC
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fc7c13b6ff..dcefc84e1ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,22 @@
 `psql` with the `-X` flag to prevent any `.psqlrc` commands from
 accidentally triggering the load of a previous DB version.**
 
+## 2.17.1 (2024-10-21)
+
+This release contains performance improvements and bug fixes since
+the 2.17.0 release. We recommend that you upgrade at the next
+available opportunity.
+
+**Features**
+* #7360 Add chunk skipping GUC
+
+**Bugfixes**
+* #7335 Change log level used in compression
+* #7342 Fix collation for in-memory tuple filtering
+
+**Thanks**
+* @gmilamjr for reporting an issue with the log level of compression messages
+* @hackbnw for reporting an issue with collation during tuple filtering
 
 ## 2.17.0 (2024-10-08)
 
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 45e7b8ef847..96493ac7be9 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -43,7 +43,8 @@ set(MOD_FILES
     updates/2.15.2--2.15.3.sql
     updates/2.15.3--2.16.0.sql
     updates/2.16.0--2.16.1.sql
-    updates/2.16.1--2.17.0.sql)
+    updates/2.16.1--2.17.0.sql
+    updates/2.17.0--2.17.1.sql)
 
 # The downgrade file to generate a downgrade script for the current version, as
 # specified in version.config
@@ -86,7 +87,8 @@ set(OLD_REV_FILES
     2.15.3--2.15.2.sql
     2.16.0--2.15.3.sql
     2.16.1--2.16.0.sql
-    2.17.0--2.16.1.sql)
+    2.17.0--2.16.1.sql
+    2.17.1--2.17.0.sql)
 
 set(MODULE_PATHNAME "$libdir/timescaledb-${PROJECT_VERSION_MOD}")
 set(LOADER_PATHNAME "$libdir/timescaledb")
diff --git a/sql/updates/2.17.0--2.17.1.sql b/sql/updates/2.17.0--2.17.1.sql
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/sql/updates/2.17.1--2.17.0.sql b/sql/updates/2.17.1--2.17.0.sql
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/version.config b/version.config
index f5bdd1c6b83..c19114dea86 100644
--- a/version.config
+++ b/version.config
@@ -1,3 +1,3 @@
 version = 2.18.0-dev
-update_from_version = 2.17.0
-downgrade_to_version = 2.17.0
+update_from_version = 2.17.1
+downgrade_to_version = 2.17.1