diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c401e7c8..0de3d5366 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,19 +11,36 @@ accidentally triggering the load of a previous DB version.**
 * #3769 Allow ALTER TABLE DROP COLUMN on compressed hypertable
 
 **Bugfixes**
+* #3808 Properly handle `max_retries` option
+
+## 2.5.1 (2021-12-02)
+
+This release contains bug fixes since the 2.5.0 release.
+We deem it medium priority to upgrade.
+
+**Bugfixes**
+* #3706 Test enabling dist compression within a procedure
+* #3734 Rework distributed DDL processing logic
+* #3737 Fix flaky pg_dump
 * #3739 Fix compression policy on tables using INTEGER
 * #3766 Fix segfault in ts_hist_sfunc
-* #3789 Fix time_bucket comparison transformation
-* #3784 Fix DISTINCT ON queries returning incorrect results on distributed hypertables
-* #3801 Fail size utility functions when data nodes do not respond
-* #3781 Segfault in fill_result_error()
 * #3779 Support GRANT/REVOKE on distributed database
-* #3808 Properly handle `max_retries` option
+* #3789 Fix time_bucket comparison transformation
+* #3797 Fix DISTINCT ON queries for distributed hyperatbles
+* #3799 Fix error printout on correct security label
+* #3801 Fail size utility functions when data nodes do not respond
+* #3809 Fix NULL pointer evaluation in fill_result_error()
+* #3811 Fix INSERT..SELECT involving dist hypertables
+* #3819 Fix reading garbage value from TSConnectionError
+* #3824 Remove pointers from CAGG lists for 64-bit archs
+* #3846 Eliminate deadlock in recompress chunk policy
+* #3881 Fix SkipScan crash due to pruned unique path
+* #3884 Fix create_distributed_restore_point memory issue
 
 **Thanks**
 * @cbisnett for reporting and fixing a typo in an error message
 * @CaptainCuddleCube for reporting bug on compression policy procedure on tables using INTEGER on time dimension
-* @phemmer for continuously reporting bugs on multi-node
+* @phemmer for reporting bugs on multi-node
 
 ## 2.5.0 (2021-10-28)
 
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 6416aef47..216ba1217 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -30,7 +30,8 @@ set(MOD_FILES
     updates/2.3.1--2.4.0.sql
     updates/2.4.0--2.4.1.sql
     updates/2.4.1--2.4.2.sql
-    updates/2.4.2--2.5.0.sql)
+    updates/2.4.2--2.5.0.sql
+    updates/2.5.0--2.5.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.5.0--2.5.1.sql b/sql/updates/2.5.0--2.5.1.sql
new file mode 100644
index 000000000..dcd9f1dd2
--- /dev/null
+++ b/sql/updates/2.5.0--2.5.1.sql
@@ -0,0 +1,3 @@
+-- Remove old compression policy procedures
+DROP PROCEDURE IF EXISTS _timescaledb_internal.policy_compression_interval(INTEGER, INTEGER, INTERVAL, INTEGER, BOOLEAN, BOOLEAN);
+DROP PROCEDURE IF EXISTS _timescaledb_internal.policy_compression_integer(INTEGER, INTEGER, BIGINT, INTEGER, BOOLEAN, BOOLEAN);
diff --git a/sql/updates/latest-dev.sql b/sql/updates/latest-dev.sql
index dcd9f1dd2..e69de29bb 100644
--- a/sql/updates/latest-dev.sql
+++ b/sql/updates/latest-dev.sql
@@ -1,3 +0,0 @@
--- Remove old compression policy procedures
-DROP PROCEDURE IF EXISTS _timescaledb_internal.policy_compression_interval(INTEGER, INTEGER, INTERVAL, INTEGER, BOOLEAN, BOOLEAN);
-DROP PROCEDURE IF EXISTS _timescaledb_internal.policy_compression_integer(INTEGER, INTEGER, BIGINT, INTEGER, BOOLEAN, BOOLEAN);
diff --git a/version.config b/version.config
index e3d495089..04cc6836e 100644
--- a/version.config
+++ b/version.config
@@ -1,3 +1,3 @@
 version = 2.6.0-dev
-update_from_version = 2.5.0
+update_from_version = 2.5.1
 downgrade_to_version = 2.5.0