diff --git a/.unreleased/5655_decompression_workers.txt b/.unreleased/5655_decompression_workers.txt
deleted file mode 100644
index 9a7d946ec0a..00000000000
--- a/.unreleased/5655_decompression_workers.txt
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5655 Improve the number of parallel workers for decompression 
\ No newline at end of file
diff --git a/.unreleased/PR_5150 b/.unreleased/PR_5150
deleted file mode 100644
index 7a56f641af4..00000000000
--- a/.unreleased/PR_5150
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5150 MERGE support on hypertables
\ No newline at end of file
diff --git a/.unreleased/PR_5586 b/.unreleased/PR_5586
deleted file mode 100644
index 4d9c263de73..00000000000
--- a/.unreleased/PR_5586
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5586 Index scan support during UPDATE/DELETE
\ No newline at end of file
diff --git a/.unreleased/PR_5805 b/.unreleased/PR_5805
deleted file mode 100644
index a48ee63e57a..00000000000
--- a/.unreleased/PR_5805
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5805 Make logrepl markers for (partial) decompressions
diff --git a/.unreleased/PR_5839 b/.unreleased/PR_5839
deleted file mode 100644
index 31e5f8f8fe0..00000000000
--- a/.unreleased/PR_5839
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5839 Support CAGG names in chunk_detailed_size
diff --git a/.unreleased/PR_5852 b/.unreleased/PR_5852
deleted file mode 100644
index 2bb083c8b9b..00000000000
--- a/.unreleased/PR_5852
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5852 Make set_chunk_time_interval CAGGs aware
diff --git a/.unreleased/PR_5868 b/.unreleased/PR_5868
deleted file mode 100644
index 66964c04cfa..00000000000
--- a/.unreleased/PR_5868
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5868 Allows ALTER TABLE ... REPLICA IDENTITY (FULL|INDEX) on materialized hypertables (continuoues aggregates)
diff --git a/.unreleased/PR_5930 b/.unreleased/PR_5930
deleted file mode 100644
index 599e2c28976..00000000000
--- a/.unreleased/PR_5930
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes: #5930 Add update tests with weird user names for jobs
-Thanks: @mrksngl for discovering and reporting the issue
diff --git a/.unreleased/PR_6036 b/.unreleased/PR_6036
deleted file mode 100644
index 313457f45fb..00000000000
--- a/.unreleased/PR_6036
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #6036 Add API function for updating OSM chunk ranges
diff --git a/.unreleased/PR_6081 b/.unreleased/PR_6081
deleted file mode 100644
index db672d882a5..00000000000
--- a/.unreleased/PR_6081
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes: #6081 Improve compressed DML datatype handling
-
diff --git a/.unreleased/bugfix_5562 b/.unreleased/bugfix_5562
deleted file mode 100644
index 3de323f9e1e..00000000000
--- a/.unreleased/bugfix_5562
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #5562 Move trigger functions to _timescaledb_functions schema
diff --git a/.unreleased/bugfix_5734 b/.unreleased/bugfix_5734
deleted file mode 100644
index 17415ae00b2..00000000000
--- a/.unreleased/bugfix_5734
+++ /dev/null
@@ -1,5 +0,0 @@
-Implements: #5860 Rectifies interval calculation for Heirarchical CAggs
-
-Fixes: #5734
-
-Thanks: @lukaskirner
diff --git a/.unreleased/bugfix_5872 b/.unreleased/bugfix_5872
deleted file mode 100644
index 57742d0553a..00000000000
--- a/.unreleased/bugfix_5872
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #5872 Fix duplicates on partially compressed chunk reads 
diff --git a/.unreleased/bugfix_5892 b/.unreleased/bugfix_5892
deleted file mode 100644
index 78ac805eede..00000000000
--- a/.unreleased/bugfix_5892
+++ /dev/null
@@ -1,2 +0,0 @@
-Implements: #5894 Check unique indexes when enabling compression
-Fixes: #5892
diff --git a/.unreleased/bugfix_5909 b/.unreleased/bugfix_5909
deleted file mode 100644
index b10042d6a2c..00000000000
--- a/.unreleased/bugfix_5909
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5909 CREATE INDEX ONLY ON hypertable creates index on chunks
diff --git a/.unreleased/bugfix_5918 b/.unreleased/bugfix_5918
deleted file mode 100644
index f33bd53bd4a..00000000000
--- a/.unreleased/bugfix_5918
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixes: #5918 Fix crash in COPY from program returning error
-
-Thanks: @alexanderlaw
diff --git a/.unreleased/bugfix_5951 b/.unreleased/bugfix_5951
deleted file mode 100644
index f6b1216adf0..00000000000
--- a/.unreleased/bugfix_5951
+++ /dev/null
@@ -1,4 +0,0 @@
-Implements: #5951 _timescaledb_internal.create_compressed_chunk doesn't account for existing uncompressed rows
-
-Fixes: #5946
-
diff --git a/.unreleased/bugfix_5990 b/.unreleased/bugfix_5990
deleted file mode 100644
index 39513242393..00000000000
--- a/.unreleased/bugfix_5990
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #5990 Place data in first/last function in correct mctx 
diff --git a/.unreleased/bugfix_5991 b/.unreleased/bugfix_5991
deleted file mode 100644
index 96dc1b67ec3..00000000000
--- a/.unreleased/bugfix_5991
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes: #5991 Call eq_func correctly in time_bucket_gapfill
-Thanks: @willsbit for reporting a crash in time_bucket_gapfill
diff --git a/.unreleased/bugfix_6015 b/.unreleased/bugfix_6015
deleted file mode 100644
index d8d7f0aabb9..00000000000
--- a/.unreleased/bugfix_6015
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #6015 Correct row count in EXPLAIN ANALYZE INSERT .. ON CONFLICT output
diff --git a/.unreleased/bugfix_6024 b/.unreleased/bugfix_6024
deleted file mode 100644
index f331b36a67d..00000000000
--- a/.unreleased/bugfix_6024
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixes: #6035 UPDATE on compressed chunk crashes server
-
-Thanks: @alexanderlaw for reporting this issue on server crash
diff --git a/.unreleased/bugfix_6037 b/.unreleased/bugfix_6037
deleted file mode 100644
index 86f413b8495..00000000000
--- a/.unreleased/bugfix_6037
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixes: #6045 Fix segfault in set_integer_now_func
-
-Thanks: @alexanderlaw for reporting this issue in set_integer_now_func
diff --git a/.unreleased/bugfix_6044 b/.unreleased/bugfix_6044
deleted file mode 100644
index f9270ad46fb..00000000000
--- a/.unreleased/bugfix_6044
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #6044 Server crash when using duplicate segmentby column
diff --git a/.unreleased/bugfix_6053 b/.unreleased/bugfix_6053
deleted file mode 100644
index 09a8f4fad43..00000000000
--- a/.unreleased/bugfix_6053
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #6053 Function approximate_row_count returns 0 for caggs
diff --git a/.unreleased/bugfix_6084 b/.unreleased/bugfix_6084
deleted file mode 100644
index f9d422aa430..00000000000
--- a/.unreleased/bugfix_6084
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes: #6084 Propagate parameter changes to decompress child nodes
-Thanks: @ajcanterbury for reporting a problem with lateral joins on compressed chunks 
diff --git a/.unreleased/bugfix_chunk_create b/.unreleased/bugfix_chunk_create
deleted file mode 100644
index 93aa83f3ccb..00000000000
--- a/.unreleased/bugfix_chunk_create
+++ /dev/null
@@ -1 +0,0 @@
-Fixes: #5788 Chunk_create must add existing table or fail
diff --git a/.unreleased/feature_5137 b/.unreleased/feature_5137
deleted file mode 100644
index df1de9a8bfa..00000000000
--- a/.unreleased/feature_5137
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5137 Insert into index during chunk compression
diff --git a/.unreleased/feature_5515 b/.unreleased/feature_5515
deleted file mode 100644
index edd1611b2bb..00000000000
--- a/.unreleased/feature_5515
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5515 Make hypertables support replica identity
diff --git a/.unreleased/feature_5596 b/.unreleased/feature_5596
deleted file mode 100644
index 45aebe0c07b..00000000000
--- a/.unreleased/feature_5596
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5596 Support for partial aggregations at chunk level 
diff --git a/.unreleased/feature_5599 b/.unreleased/feature_5599
deleted file mode 100644
index 74a113a0c9f..00000000000
--- a/.unreleased/feature_5599
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5599 Enable ChunkAppend for partially compressed chunks
\ No newline at end of file
diff --git a/.unreleased/feature_5758 b/.unreleased/feature_5758
deleted file mode 100644
index c3e4b2dab00..00000000000
--- a/.unreleased/feature_5758
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5758 Enable altering job schedule type through `alter_job`
diff --git a/.unreleased/feature_5809 b/.unreleased/feature_5809
deleted file mode 100644
index 51a1b30a450..00000000000
--- a/.unreleased/feature_5809
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5809 Relax invalidation threshold table-level lock to row-level when refreshing a Continuous Aggregate
diff --git a/.unreleased/feature_5875 b/.unreleased/feature_5875
deleted file mode 100644
index df37b7deea2..00000000000
--- a/.unreleased/feature_5875
+++ /dev/null
@@ -1 +0,0 @@
-Implements: #5875 Add job exit status and runtime to log
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61939ed7ec4..62afce64ee4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,61 @@
 `psql` with the `-X` flag to prevent any `.psqlrc` commands from
 accidentally triggering the load of a previous DB version.**
 
+## 2.12.0 (2023-09-20)
+
+This release contains bug fixes since the 2.11.2 release.
+We recommend that you upgrade at the next available opportunity.
+
+This release moves all internal functions from the _timescaleb_internal
+schema into the _timescaledb_functions schema. This separates code from
+internal data objects and improves security by allowing more restrictive
+permissions for the code schema. If you are calling any of those internal
+functions you should adjust your code as soon as possible. This version
+also includes a compatibility layer that allows calling them in the old
+location but that layer will be removed by a future version.
+
+**Features**
+* #5137 Insert into index during chunk compression
+* #5150 MERGE support on hypertables
+* #5515 Make hypertables support replica identity
+* #5586 Index scan support during UPDATE/DELETE
+* #5596 Support for partial aggregations at chunk level
+* #5599 Enable ChunkAppend for partially compressed chunks
+* #5655 Improve the number of parallel workers for decompression
+* #5758 Enable altering job schedule type through `alter_job`
+* #5805 Make logrepl markers for (partial) decompressions
+* #5809 Relax invalidation threshold table-level lock to row-level when refreshing a Continuous Aggregate
+* #5839 Support CAgg names in chunk_detailed_size
+* #5852 Make set_chunk_time_interval CAggs aware
+* #5868 Allows ALTER TABLE ... REPLICA IDENTITY (FULL|INDEX) on materialized hypertables (continuous aggregates)
+* #5875 Add job exit status and runtime to log
+* #5909 CREATE INDEX ONLY ON hypertable creates index on chunks
+
+**Bugfixes**
+* #5860 Fix interval calculation for hierarchical CAggs
+* #5894 Check unique indexes when enabling compression
+* #5951 _timescaledb_internal.create_compressed_chunk doesn't account for existing uncompressed rows
+* #5988 Move functions to _timescaledb_functions schema
+* #5788 Chunk_create must add existing table or fail
+* #5872 Fix duplicates on partially compressed chunk reads
+* #5918 Fix crash in COPY from program returning error
+* #5990 Place data in first/last function in correct mctx 
+* #5991 Call eq_func correctly in time_bucket_gapfill
+* #6015 Correct row count in EXPLAIN ANALYZE INSERT .. ON CONFLICT output
+* #6035 Fix server crash on UPDATE of compressed chunk
+* #6044 Fix server crash when using duplicate segmentby column
+* #6045 Fix segfault in set_integer_now_func
+* #6053 Fix approximate_row_count for CAggs
+* #6081 Improve compressed DML datatype handling
+* #6084 Propagate parameter changes to decompress child nodes
+
+**Thanks**
+* @ajcanterbury for reporting a problem with lateral joins on compressed chunks 
+* @alexanderlaw for reporting multiple server crashes 
+* @lukaskirner for reporting a bug with monthly continuous aggregates
+* @mrksngl for reporting a bug with unusual user names
+* @willsbit for reporting a crash in time_bucket_gapfill
+
 ## 2.11.2 (2023-08-09)
 
 This release contains bug fixes since the 2.11.1 release.
@@ -72,7 +127,6 @@ This release includes these noteworthy features:
 * #5584 Reduce decompression during constraint checking
 * #5530 Optimize compressed chunk resorting
 * #5639 Support sending telemetry event reports
-* #5150 MERGE support on hypertables
 
 **Bugfixes**
 * #5396 Fix SEGMENTBY columns predicates to be pushed down