diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b2a1449..cd8ad907 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,44 @@
+0.4.0 (2022-11-07)
+===================
+
+This release requires **Node.JS 16** or greater.
+
+Features
+--------
+
+- Add support for Jingle file uploads, presence, IM typing notifications for the XMPP backend. ([\#288](https://github.com/matrix-org/matrix-bifrost/issues/288))
+- Include attachment URLs (if present) with libpurple-bridged messages ([\#290](https://github.com/matrix-org/matrix-bifrost/issues/290))
+
+
+Bugfixes
+--------
+
+- Fix an issue where Bifrost could not register users (by upgrading to matrix-appservice-bridge@2.6.0) ([\#246](https://github.com/matrix-org/matrix-bifrost/issues/246))
+- Don't log pings being sent before they're actually sent ([\#260](https://github.com/matrix-org/matrix-bifrost/issues/260))
+- Make XMPP connection handling more resilient ([\#264](https://github.com/matrix-org/matrix-bifrost/issues/264))
+- Fix message formatter sometimes producing invalid HTML ([\#286](https://github.com/matrix-org/matrix-bifrost/issues/286))
+- correct typo of pluginDir in sample config/doc ([\#302](https://github.com/matrix-org/matrix-bifrost/issues/302))
+
+
+Deprecations and Removals
+-------------------------
+
+- The minimum supported version of node.js is now 16. ([\#315](https://github.com/matrix-org/matrix-bifrost/issues/315))
+
+
+Internal Changes
+----------------
+
+- Optimize updateMatrixMemberListForRoom() ([\#243](https://github.com/matrix-org/matrix-bifrost/issues/243))
+- Migrate to `eslint` for linting. ([\#262](https://github.com/matrix-org/matrix-bifrost/issues/262))
+- Sanity check that the homeserver can reach the bridge on startup. ([\#266](https://github.com/matrix-org/matrix-bifrost/issues/266))
+- Update dependencies including `axios`, `prom-client` and `uuid`. The handling of entities in XMPP messages is now XML compliant rather than HTML5 complaint. ([\#267](https://github.com/matrix-org/matrix-bifrost/issues/267))
+- Add new store function `getAdminRoom` and rename `getRoomByRemoteData` -> `getGroupRoomByRemoteData` ([\#272](https://github.com/matrix-org/matrix-bifrost/issues/272))
+- Speed up joins for large rooms from XMPP gateways, preventing them from locking up the process ([\#293](https://github.com/matrix-org/matrix-bifrost/issues/293))
+- Docker images are now automatically build and published via GitHub Actions, replacing DockerHub Autobuilds. ([\#295](https://github.com/matrix-org/matrix-bifrost/issues/295))
+- Use GitHub actions for CI. ([\#316](https://github.com/matrix-org/matrix-bifrost/issues/316))
+
+
 0.3.0 (2021-04-26)
 ==================
 
diff --git a/changelog.d/243.misc b/changelog.d/243.misc
deleted file mode 100644
index b690e44b..00000000
--- a/changelog.d/243.misc
+++ /dev/null
@@ -1 +0,0 @@
-Optimize updateMatrixMemberListForRoom()
diff --git a/changelog.d/246.bugfix b/changelog.d/246.bugfix
deleted file mode 100644
index e7805411..00000000
--- a/changelog.d/246.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix an issue where Bifrost could not register users (by upgrading to matrix-appservice-bridge@2.6.0)
diff --git a/changelog.d/260.bugfix b/changelog.d/260.bugfix
deleted file mode 100644
index 2adce56f..00000000
--- a/changelog.d/260.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Don't log pings being sent before they're actually sent
diff --git a/changelog.d/262.misc b/changelog.d/262.misc
deleted file mode 100644
index d8b625f8..00000000
--- a/changelog.d/262.misc
+++ /dev/null
@@ -1 +0,0 @@
-Migrate to `eslint` for linting.
\ No newline at end of file
diff --git a/changelog.d/264.bugfix b/changelog.d/264.bugfix
deleted file mode 100644
index af43fca6..00000000
--- a/changelog.d/264.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Make XMPP connection handling more resilient
diff --git a/changelog.d/266.misc b/changelog.d/266.misc
deleted file mode 100644
index a0d8fbda..00000000
--- a/changelog.d/266.misc
+++ /dev/null
@@ -1 +0,0 @@
-Sanity check that the homeserver can reach the bridge on startup.
\ No newline at end of file
diff --git a/changelog.d/267.misc b/changelog.d/267.misc
deleted file mode 100644
index a9c4e5af..00000000
--- a/changelog.d/267.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update dependencies including `axios`, `prom-client` and `uuid`. The handling of entities in XMPP messages is now XML compliant rather than HTML5 complaint.
\ No newline at end of file
diff --git a/changelog.d/272.misc b/changelog.d/272.misc
deleted file mode 100644
index c5767436..00000000
--- a/changelog.d/272.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add new store function `getAdminRoom` and rename `getRoomByRemoteData` -> `getGroupRoomByRemoteData`
\ No newline at end of file
diff --git a/changelog.d/286.bugfix b/changelog.d/286.bugfix
deleted file mode 100644
index 42b98047..00000000
--- a/changelog.d/286.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix message formatter sometimes producing invalid HTML
diff --git a/changelog.d/288.feature b/changelog.d/288.feature
deleted file mode 100644
index 3e04e5e8..00000000
--- a/changelog.d/288.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for Jingle file uploads, presence, IM typing notifications for the XMPP backend.
\ No newline at end of file
diff --git a/changelog.d/290.feature b/changelog.d/290.feature
deleted file mode 100644
index 60e41d64..00000000
--- a/changelog.d/290.feature
+++ /dev/null
@@ -1 +0,0 @@
-Include attachment URLs (if present) with libpurple-bridged messages
diff --git a/changelog.d/293.misc b/changelog.d/293.misc
deleted file mode 100644
index 25697963..00000000
--- a/changelog.d/293.misc
+++ /dev/null
@@ -1 +0,0 @@
-Speed up joins for large rooms from XMPP gateways, preventing them from locking up the process
diff --git a/changelog.d/295.misc b/changelog.d/295.misc
deleted file mode 100644
index 9cddb55f..00000000
--- a/changelog.d/295.misc
+++ /dev/null
@@ -1 +0,0 @@
-Docker images are now automatically build and published via GitHub Actions, replacing DockerHub Autobuilds.
\ No newline at end of file
diff --git a/changelog.d/302.bugfix b/changelog.d/302.bugfix
deleted file mode 100644
index ce721427..00000000
--- a/changelog.d/302.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-correct typo of pluginDir in sample config/doc
diff --git a/changelog.d/315.removal b/changelog.d/315.removal
deleted file mode 100644
index 4618a4ed..00000000
--- a/changelog.d/315.removal
+++ /dev/null
@@ -1 +0,0 @@
-The minimum supported version of node.js is now 16.
\ No newline at end of file
diff --git a/changelog.d/316.misc b/changelog.d/316.misc
deleted file mode 100644
index e55ae0f2..00000000
--- a/changelog.d/316.misc
+++ /dev/null
@@ -1 +0,0 @@
-Use GitHub actions for CI.
\ No newline at end of file
diff --git a/package.json b/package.json
index 73a0e0c4..cb80ef4d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-bifrost",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Multi protocol bridging for Matrix.",
   "engines": {
     "node": ">=16"