diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33e092d3..bda1e0a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+2.4.0 (2022-10-21)
+==================
+
+Features
+--------
+
+- Add support for notifying when a GitHub workflow completes. ([\#520](https://github.com/matrix-org/matrix-hookshot/issues/520))
+- Disable GitHub workflow events by default. ([\#528](https://github.com/matrix-org/matrix-hookshot/issues/528))
+- Support Jira version events. ([\#534](https://github.com/matrix-org/matrix-hookshot/issues/534))
+- Allow multiple Jira connections at a time (either in the same room or across multiple rooms). ([\#540](https://github.com/matrix-org/matrix-hookshot/issues/540))
+
+
+Bugfixes
+--------
+
+- Mention the `help` in AdminRooms if they send an invalid command. ([\#522](https://github.com/matrix-org/matrix-hookshot/issues/522))
+- Fix an issue where `github status` would not respond with an error if your personal token had expired.
+  Fix GitHub refresh tokens occasionally not working. ([\#523](https://github.com/matrix-org/matrix-hookshot/issues/523))
+- Add support for notifying when a GitHub workflow completes. ([\#524](https://github.com/matrix-org/matrix-hookshot/issues/524))
+- Fix a crash caused by invalid configuration in connection state events. ([\#537](https://github.com/matrix-org/matrix-hookshot/issues/537))
+- Fix the Jira config widget to properly add listeners for issue creation events & expose support for issue update events. ([\#543](https://github.com/matrix-org/matrix-hookshot/issues/543))
+
+
+Internal Changes
+----------------
+
+- Use the `matrix-appservice-bridge` logging implementation. ([\#488](https://github.com/matrix-org/matrix-hookshot/issues/488))
+- Increase network timeout for Docker builds, and fix Docker build OOMing in CI for arm64 builds. ([\#535](https://github.com/matrix-org/matrix-hookshot/issues/535))
+
+
 2.3.0 (2022-10-05)
 ==================
 
diff --git a/changelog.d/488.misc b/changelog.d/488.misc
deleted file mode 100644
index 5764f3e2..00000000
--- a/changelog.d/488.misc
+++ /dev/null
@@ -1 +0,0 @@
-Use the `matrix-appservice-bridge` logging implementation.
\ No newline at end of file
diff --git a/changelog.d/520.feature b/changelog.d/520.feature
deleted file mode 100644
index 9ace6bd4..00000000
--- a/changelog.d/520.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for notifying when a GitHub workflow completes.
diff --git a/changelog.d/522.bugfix b/changelog.d/522.bugfix
deleted file mode 100644
index 5edab9eb..00000000
--- a/changelog.d/522.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Mention the `help` in AdminRooms if they send an invalid command.
\ No newline at end of file
diff --git a/changelog.d/523.bugfix b/changelog.d/523.bugfix
deleted file mode 100644
index 760a0c4d..00000000
--- a/changelog.d/523.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix an issue where `github status` would not respond with an error if your personal token had expired.
-Fix GitHub refresh tokens occasionally not working.
\ No newline at end of file
diff --git a/changelog.d/524.bugfix b/changelog.d/524.bugfix
deleted file mode 100644
index 9ace6bd4..00000000
--- a/changelog.d/524.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add support for notifying when a GitHub workflow completes.
diff --git a/changelog.d/528.feature b/changelog.d/528.feature
deleted file mode 100644
index c94b160a..00000000
--- a/changelog.d/528.feature
+++ /dev/null
@@ -1 +0,0 @@
-Disable GitHub workflow events by default.
\ No newline at end of file
diff --git a/changelog.d/534.feature b/changelog.d/534.feature
deleted file mode 100644
index a2e39dde..00000000
--- a/changelog.d/534.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support Jira version events.
diff --git a/changelog.d/535.misc b/changelog.d/535.misc
deleted file mode 100644
index c5847bdb..00000000
--- a/changelog.d/535.misc
+++ /dev/null
@@ -1 +0,0 @@
-Increase network timeout for Docker builds, and fix Docker build OOMing in CI for arm64 builds.
diff --git a/changelog.d/537.bugfix b/changelog.d/537.bugfix
deleted file mode 100644
index 57217a5a..00000000
--- a/changelog.d/537.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a crash caused by invalid configuration in connection state events.
\ No newline at end of file
diff --git a/changelog.d/540.feature b/changelog.d/540.feature
deleted file mode 100644
index 2cc4fa0f..00000000
--- a/changelog.d/540.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow multiple Jira connections at a time (either in the same room or across multiple rooms).
diff --git a/changelog.d/543.bugfix b/changelog.d/543.bugfix
deleted file mode 100644
index 50d538cd..00000000
--- a/changelog.d/543.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix the Jira config widget to properly add listeners for issue creation events & expose support for issue update events.
diff --git a/package.json b/package.json
index b30543a2..bd48008c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-hookshot",
-  "version": "2.3.0",
+  "version": "2.4.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",