diff --git a/CHANGELOG.md b/CHANGELOG.md
index e394c893..7478d48e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+# 6.0.0 (2024-11-29)
+
+### Features
+
+- Add support for setting an expiry time on a webhook. See the documentation on [Generic Webhooks](https://matrix-org.github.io/matrix-hookshot/latest/setup/webhooks.html) for more information. ([\#984](https://github.com/matrix-org/matrix-hookshot/issues/984))
+- Support for E2E Encrypted rooms is now considered stable and can be enabled in production. Please see the [documentation](https://matrix-org.github.io/matrix-hookshot/latest/advanced/encryption.html)
+  on the requirements for enabling support. ([\#989](https://github.com/matrix-org/matrix-hookshot/issues/989))
+
+### Bugfixes
+
+- Fix Challenge Hound activities being duplicated if the cache layer (e.g Redis) goes away. ([\#982](https://github.com/matrix-org/matrix-hookshot/issues/982))
+
+### Deprecations and Removals
+
+- Drop support for Node 20 and start supporting Node 22, 23. ([\#990](https://github.com/matrix-org/matrix-hookshot/issues/990))
+
+### Internal Changes
+
+- Reduce bundle size of widget. ([\#985](https://github.com/matrix-org/matrix-hookshot/issues/985))
+- Don't invoke newsfile CI check for dependabot. ([\#987](https://github.com/matrix-org/matrix-hookshot/issues/987))
+- Add devenv development files. ([\#993](https://github.com/matrix-org/matrix-hookshot/issues/993))
+- Push Docker images to ghcr.io, and and build an image on each commit. ([\#994](https://github.com/matrix-org/matrix-hookshot/issues/994))
+- Retry e2e tests in CI due to container creation flakiness. ([\#995](https://github.com/matrix-org/matrix-hookshot/issues/995))
+- Update matrix-bot-sdk to pull in new matrix-rust-sdk. ([\#996](https://github.com/matrix-org/matrix-hookshot/issues/996))
+
+
 5.4.1 (2024-06-21)
 ==================
 
diff --git a/changelog.d/982.bugfix b/changelog.d/982.bugfix
deleted file mode 100644
index aa5bf45c..00000000
--- a/changelog.d/982.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix Challenge Hound activities being duplicated if the cache layer (e.g Redis) goes away.
diff --git a/changelog.d/984.feature b/changelog.d/984.feature
deleted file mode 100644
index db3e6d8a..00000000
--- a/changelog.d/984.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for setting an expiry time on a webhook. See the documentation on [Generic Webhooks](https://matrix-org.github.io/matrix-hookshot/latest/setup/webhooks.html) for more information.
diff --git a/changelog.d/985.misc b/changelog.d/985.misc
deleted file mode 100644
index da85c970..00000000
--- a/changelog.d/985.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce bundle size of widget.
diff --git a/changelog.d/987.misc b/changelog.d/987.misc
deleted file mode 100644
index 6c1230de..00000000
--- a/changelog.d/987.misc
+++ /dev/null
@@ -1 +0,0 @@
-Don't invoke newsfile CI check for dependabot.
diff --git a/changelog.d/989.feature b/changelog.d/989.feature
deleted file mode 100644
index c396d2c0..00000000
--- a/changelog.d/989.feature
+++ /dev/null
@@ -1,2 +0,0 @@
-Support for E2E Encrypted rooms is now considered stable and can be enabled in production. Please see the [documentation](https://matrix-org.github.io/matrix-hookshot/latest/advanced/encryption.html)
-on the requirements for enabling support.
\ No newline at end of file
diff --git a/changelog.d/990.removal b/changelog.d/990.removal
deleted file mode 100644
index 9b90f6d4..00000000
--- a/changelog.d/990.removal
+++ /dev/null
@@ -1 +0,0 @@
-Drop support for Node 20 and start supporting Node 22, 23.
\ No newline at end of file
diff --git a/changelog.d/993.misc b/changelog.d/993.misc
deleted file mode 100644
index e6001246..00000000
--- a/changelog.d/993.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add devenv development files.
diff --git a/changelog.d/994.misc b/changelog.d/994.misc
deleted file mode 100644
index 8133a9ba..00000000
--- a/changelog.d/994.misc
+++ /dev/null
@@ -1 +0,0 @@
-Push Docker images to ghcr.io, and and build an image on each commit.
diff --git a/changelog.d/995.misc b/changelog.d/995.misc
deleted file mode 100644
index 51157da6..00000000
--- a/changelog.d/995.misc
+++ /dev/null
@@ -1 +0,0 @@
-Retry e2e tests in CI due to container creation flakiness.
diff --git a/changelog.d/996.misc b/changelog.d/996.misc
deleted file mode 100644
index e9d51f7d..00000000
--- a/changelog.d/996.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update matrix-bot-sdk to pull in new matrix-rust-sdk.
diff --git a/package.json b/package.json
index 295e8105..bee3a938 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-hookshot",
-  "version": "5.4.1",
+  "version": "6.0.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",