diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7a364c9..2c63e6ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,52 @@
+2.6.0 (2023-01-13)
+==================
+
+Features
+--------
+
+- Add support for end-to-bridge encryption via MSC3202. ([\#299](https://github.com/matrix-org/matrix-hookshot/issues/299))
+- Add support for additional bot users called "service bots" which handle a particular connection type, so that different services can be used through different bot users. ([\#573](https://github.com/matrix-org/matrix-hookshot/issues/573))
+- Add new GitHubRepo connection config setting `workflowRun.workflows` to filter run reports by workflow name. ([\#588](https://github.com/matrix-org/matrix-hookshot/issues/588))
+- The GitHub/GitLab connection state configuration has changed. The configuration option `ignoreHooks` is now deprecated, and new connections may not use this options.
+  Users should instead explicitly configure all the hooks they want to enable with the `enableHooks` option. Existing connections will continue to work with both options. ([\#592](https://github.com/matrix-org/matrix-hookshot/issues/592))
+- A11y: Add alt tags to all images. ([\#602](https://github.com/matrix-org/matrix-hookshot/issues/602))
+
+
+Bugfixes
+--------
+
+- Parent projects are now taken into account when calculating a user's access level to a GitLab project. ([\#539](https://github.com/matrix-org/matrix-hookshot/issues/539))
+- Ensure bridge treats published and drafted GitHub releases as different events. ([\#582](https://github.com/matrix-org/matrix-hookshot/issues/582))
+- Fix a bug where unknown keys in a connections state would be clobbered when updated via widget UI. ([\#587](https://github.com/matrix-org/matrix-hookshot/issues/587))
+- Improve webhook code editor performance. ([\#601](https://github.com/matrix-org/matrix-hookshot/issues/601))
+- Correctly apply CSS for recent RSS feed changes. ([\#604](https://github.com/matrix-org/matrix-hookshot/issues/604))
+- Improve startup stability by not loading all room state at once. ([\#614](https://github.com/matrix-org/matrix-hookshot/issues/614))
+- You can now add multiple GitLab connections to the same room with the same project path, if they are under different instances. ([\#617](https://github.com/matrix-org/matrix-hookshot/issues/617))
+
+
+Improved Documentation
+----------------------
+
+- Clarify GitLab setup docs ([\#350](https://github.com/matrix-org/matrix-hookshot/issues/350))
+- Change URL protocol in the ocumentation and sample configs to HTTPS. ([\#623](https://github.com/matrix-org/matrix-hookshot/issues/623))
+
+
+Deprecations and Removals
+-------------------------
+
+- Remove support for Pantalaimon-based encryption. ([\#299](https://github.com/matrix-org/matrix-hookshot/issues/299))
+
+
+Internal Changes
+----------------
+
+- RSS feed polling now uses cache headers sent by servers, which should mean we will be more conservative on resources. ([\#583](https://github.com/matrix-org/matrix-hookshot/issues/583))
+- Only build ARM images when merging or releasing, due to slow ARM build times. ([\#589](https://github.com/matrix-org/matrix-hookshot/issues/589))
+- Increase maximum size of incoming webhook payload from `100kb` to `10mb`. ([\#606](https://github.com/matrix-org/matrix-hookshot/issues/606))
+- Mark encryption feature as experimental (config option is now `experimentalEncryption`). ([\#610](https://github.com/matrix-org/matrix-hookshot/issues/610))
+- Cache yarn dependencies during Docker build. ([\#615](https://github.com/matrix-org/matrix-hookshot/issues/615))
+
+
 2.5.0 (2022-12-02)
 ==================
 
diff --git a/changelog.d/299.feature b/changelog.d/299.feature
deleted file mode 100644
index 7c50d02d..00000000
--- a/changelog.d/299.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for end-to-bridge encryption via MSC3202.
diff --git a/changelog.d/299.removal b/changelog.d/299.removal
deleted file mode 100644
index 2b8b2023..00000000
--- a/changelog.d/299.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove support for Pantalaimon-based encryption.
diff --git a/changelog.d/350.doc b/changelog.d/350.doc
deleted file mode 100644
index 74f877b2..00000000
--- a/changelog.d/350.doc
+++ /dev/null
@@ -1 +0,0 @@
-Clarify GitLab setup docs
diff --git a/changelog.d/539.bugfix b/changelog.d/539.bugfix
deleted file mode 100644
index dd75d805..00000000
--- a/changelog.d/539.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Parent projects are now taken into account when calculating a user's access level to a GitLab project.
\ No newline at end of file
diff --git a/changelog.d/573.feature b/changelog.d/573.feature
deleted file mode 100644
index 95dd9f0d..00000000
--- a/changelog.d/573.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for additional bot users called "service bots" which handle a particular connection type, so that different services can be used through different bot users.
diff --git a/changelog.d/582.bugfix b/changelog.d/582.bugfix
deleted file mode 100644
index 5772615e..00000000
--- a/changelog.d/582.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure bridge treats published and drafted GitHub releases as different events.
\ No newline at end of file
diff --git a/changelog.d/583.misc b/changelog.d/583.misc
deleted file mode 100644
index 0b69b9ce..00000000
--- a/changelog.d/583.misc
+++ /dev/null
@@ -1 +0,0 @@
-RSS feed polling now uses cache headers sent by servers, which should mean we will be more conservative on resources.
\ No newline at end of file
diff --git a/changelog.d/587.bugfix b/changelog.d/587.bugfix
deleted file mode 100644
index dd6f4eff..00000000
--- a/changelog.d/587.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where unknown keys in a connections state would be clobbered when updated via widget UI.
\ No newline at end of file
diff --git a/changelog.d/588.feature b/changelog.d/588.feature
deleted file mode 100644
index 2a876596..00000000
--- a/changelog.d/588.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add new GitHubRepo connection config setting `workflowRun.workflows` to filter run reports by workflow name.
\ No newline at end of file
diff --git a/changelog.d/589.misc b/changelog.d/589.misc
deleted file mode 100644
index a0029db7..00000000
--- a/changelog.d/589.misc
+++ /dev/null
@@ -1 +0,0 @@
-Only build ARM images when merging or releasing, due to slow ARM build times.
\ No newline at end of file
diff --git a/changelog.d/592.feature b/changelog.d/592.feature
deleted file mode 100644
index cc52ed81..00000000
--- a/changelog.d/592.feature
+++ /dev/null
@@ -1,2 +0,0 @@
-The GitHub/GitLab connection state configuration has changed. The configuration option `ignoreHooks` is now deprecated, and new connections may not use this options.
-Users should instead explicitly configure all the hooks they want to enable with the `enableHooks` option. Existing connections will continue to work with both options.
diff --git a/changelog.d/601.bugfix b/changelog.d/601.bugfix
deleted file mode 100644
index 17bd0e0c..00000000
--- a/changelog.d/601.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Improve webhook code editor performance.
\ No newline at end of file
diff --git a/changelog.d/602.feature b/changelog.d/602.feature
deleted file mode 100644
index d07f9255..00000000
--- a/changelog.d/602.feature
+++ /dev/null
@@ -1 +0,0 @@
-A11y: Add alt tags to all images.
diff --git a/changelog.d/604.bugfix b/changelog.d/604.bugfix
deleted file mode 100644
index 07983231..00000000
--- a/changelog.d/604.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Correctly apply CSS for recent RSS feed changes.
diff --git a/changelog.d/606.misc b/changelog.d/606.misc
deleted file mode 100644
index 061e396f..00000000
--- a/changelog.d/606.misc
+++ /dev/null
@@ -1 +0,0 @@
-Increase maximum size of incoming webhook payload from `100kb` to `10mb`.
diff --git a/changelog.d/610.misc b/changelog.d/610.misc
deleted file mode 100644
index ebdcb896..00000000
--- a/changelog.d/610.misc
+++ /dev/null
@@ -1 +0,0 @@
-Mark encryption feature as experimental (config option is now `experimentalEncryption`).
\ No newline at end of file
diff --git a/changelog.d/614.bugfix b/changelog.d/614.bugfix
deleted file mode 100644
index d9d8a441..00000000
--- a/changelog.d/614.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Improve startup stability by not loading all room state at once.
\ No newline at end of file
diff --git a/changelog.d/615.misc b/changelog.d/615.misc
deleted file mode 100644
index ac59177e..00000000
--- a/changelog.d/615.misc
+++ /dev/null
@@ -1 +0,0 @@
-Cache yarn dependencies during Docker build.
\ No newline at end of file
diff --git a/changelog.d/617.bugfix b/changelog.d/617.bugfix
deleted file mode 100644
index d8d88539..00000000
--- a/changelog.d/617.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-You can now add multiple GitLab connections to the same room with the same project path, if they are under different instances.
\ No newline at end of file
diff --git a/changelog.d/623.doc b/changelog.d/623.doc
deleted file mode 100644
index 5e389d15..00000000
--- a/changelog.d/623.doc
+++ /dev/null
@@ -1 +0,0 @@
-Change URL protocol in the ocumentation and sample configs to HTTPS.
diff --git a/package.json b/package.json
index bec2298f..5ee67a2e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-hookshot",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",
   "main": "lib/app.js",
   "repository": "https://github.com/matrix-org/matrix-hookshot",