diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad81b3a9..4a1ee3cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,39 @@
+4.0.0 (2023-04-27)
+==================
+
+Features
+--------
+
+- Add support for specifying custom templates for feeds. ([\#702](https://github.com/matrix-org/matrix-hookshot/issues/702))
+- Use SQLite for file-based crypto stores by default, instead of Sled. ([\#714](https://github.com/matrix-org/matrix-hookshot/issues/714))
+- Notifications for RSS feed failures can now be toggled on and off. The feature is now **off** by default. ([\#716](https://github.com/matrix-org/matrix-hookshot/issues/716))
+
+
+Bugfixes
+--------
+
+- Fix mishandling of empty feed/item title tags. ([\#708](https://github.com/matrix-org/matrix-hookshot/issues/708))
+- Add information about GitHub App Installs in 'update' state on the oauth status page. ([\#717](https://github.com/matrix-org/matrix-hookshot/issues/717))
+- Fix cases of GitHub repos not being bridgable if the GitHub App had to be manually approved. ([\#718](https://github.com/matrix-org/matrix-hookshot/issues/718))
+- Switch to using Rust for parsing RSS feeds. ([\#721](https://github.com/matrix-org/matrix-hookshot/issues/721))
+
+
+Deprecations and Removals
+-------------------------
+
+- Add support for Node 20, and drop support for Node 16. ([\#724](https://github.com/matrix-org/matrix-hookshot/issues/724))
+
+
+Internal Changes
+----------------
+
+- Ensure all Hookshot specific metrics have a `hookshot_` prefix. ([\#701](https://github.com/matrix-org/matrix-hookshot/issues/701))
+- Update dependency used in Generic Webhook JS functions to fix a security flaw. ([\#705](https://github.com/matrix-org/matrix-hookshot/issues/705))
+- Switch to using Rust for parsing RSS feeds. ([\#709](https://github.com/matrix-org/matrix-hookshot/issues/709))
+- Update the README with a prettier set of features. ([\#726](https://github.com/matrix-org/matrix-hookshot/issues/726))
+- Update `yaml` dependency to `2.2.2` ([\#728](https://github.com/matrix-org/matrix-hookshot/issues/728))
+
+
 3.2.0 (2023-04-04)
 ==================
 
diff --git a/changelog.d/701.misc b/changelog.d/701.misc
deleted file mode 100644
index 28cd3054..00000000
--- a/changelog.d/701.misc
+++ /dev/null
@@ -1 +0,0 @@
-Ensure all Hookshot specific metrics have a `hookshot_` prefix.
diff --git a/changelog.d/702.feature b/changelog.d/702.feature
deleted file mode 100644
index e3d040cc..00000000
--- a/changelog.d/702.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for specifying custom templates for feeds.
\ No newline at end of file
diff --git a/changelog.d/705.misc b/changelog.d/705.misc
deleted file mode 100644
index 8b4985e5..00000000
--- a/changelog.d/705.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update dependency used in Generic Webhook JS functions to fix a security flaw.
diff --git a/changelog.d/708.bugfix b/changelog.d/708.bugfix
deleted file mode 100644
index d523912e..00000000
--- a/changelog.d/708.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix mishandling of empty feed/item title tags.
diff --git a/changelog.d/709.misc b/changelog.d/709.misc
deleted file mode 100644
index 83377c9c..00000000
--- a/changelog.d/709.misc
+++ /dev/null
@@ -1 +0,0 @@
-Switch to using Rust for parsing RSS feeds.
\ No newline at end of file
diff --git a/changelog.d/714.feature b/changelog.d/714.feature
deleted file mode 100644
index 8a7dc9aa..00000000
--- a/changelog.d/714.feature
+++ /dev/null
@@ -1 +0,0 @@
-Use SQLite for file-based crypto stores by default, instead of Sled.
diff --git a/changelog.d/716.feature b/changelog.d/716.feature
deleted file mode 100644
index 958c5451..00000000
--- a/changelog.d/716.feature
+++ /dev/null
@@ -1 +0,0 @@
-Notifications for RSS feed failures can now be toggled on and off. The feature is now **off** by default.
\ No newline at end of file
diff --git a/changelog.d/717.bugfix b/changelog.d/717.bugfix
deleted file mode 100644
index cd8564c4..00000000
--- a/changelog.d/717.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add information about GitHub App Installs in 'update' state on the oauth status page.
diff --git a/changelog.d/718.bugfix b/changelog.d/718.bugfix
deleted file mode 100644
index de97bd20..00000000
--- a/changelog.d/718.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix cases of GitHub repos not being bridgable if the GitHub App had to be manually approved.
diff --git a/changelog.d/721.bugfix b/changelog.d/721.bugfix
deleted file mode 100644
index 4a4492f3..00000000
--- a/changelog.d/721.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Switch to using Rust for parsing RSS feeds.
diff --git a/changelog.d/724.removal b/changelog.d/724.removal
deleted file mode 100644
index 71a81a56..00000000
--- a/changelog.d/724.removal
+++ /dev/null
@@ -1 +0,0 @@
-Add support for Node 20, and drop support for Node 16.
\ No newline at end of file
diff --git a/changelog.d/726.misc b/changelog.d/726.misc
deleted file mode 100644
index 8bab751f..00000000
--- a/changelog.d/726.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update the README with a prettier set of features.
diff --git a/changelog.d/728.misc b/changelog.d/728.misc
deleted file mode 100644
index 2623cc30..00000000
--- a/changelog.d/728.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update `yaml` dependency to `2.2.2`
diff --git a/package.json b/package.json
index 650cc467..0c4a0956 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-hookshot",
-  "version": "3.2.0",
+  "version": "4.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",