diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdb40d28c..fb058269d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,45 @@
+# Continuwuity v0.5.7 (2026-04-17)
+
+## Features
+
+- Re-added support for reading registration tokens from a file. Contributed by @ginger and @benbot. (#1371)
+- Add new config option to allow or disallow search engine indexing through a `<meta ../>` tag. Defaults to blocking indexing (`content="noindex"`). Contributed by @s1lv3r and @ginger. (#1527)
+- Add new config option for [MSC4439](https://github.com/matrix-org/matrix-spec-proposals/pull/4439)
+  PGP key URIs. Contributed by LogN. (#1609)
+- Added `!admin users reset-push-rules` command to reset the notification settings of users. Contributed by @nex. (#1613)
+- Notification pushers are now automatically removed when their associated device is. Admin commands now exist for manual cleanup too. Contributed by @nex. (#1614)
+- Implemented option to deprioritize servers for room join requests. Contributed by @ezera. (#1624)
+- Added admin commands to get build information and features. Contributed by @Jade (#1629)
+- Added support for associating email addresses with accounts, requiring email addresses for registration, and resetting passwords via email. Contributed by @ginger
+- Added support for requiring users to accept terms and conditions when registering.
+- Added support for using an admin command to issue self-service password reset links.
+
+## Bugfixes
+
+- Fixed corrupted appservice registrations causing the server to enter a crash loop. Contributed by @nex. (#1265)
+- Prevent removing the admin room alias (`#admins`) to avoid accidentally breaking admin room functionality. Contributed by @0xnim (#1448)
+- Stripped `join_authorised_via_users_server` from json if user is already in room (@partha:cxy.run) (#1542)
+- Fixed internal server errors for fetching thumbnails. Contributed by @PerformativeJade (#1572)
+- Fixed error 500 when joining non-existent rooms. Contributed by @ezera. (#1579)
+- Refactored nix package. Breaking, since `all-features` package no longer exists. Continuwuity is now built with jemalloc and liburing by default. Contributed by @Henry-Hiles (QuadRadical). (#1596)
+- Fixed resolving IP of servers that only use SRV delegation. Contributed by @tulir. (#1615)
+- Fixed "Sender must be a local user" error for make_join, make_knock, and make_leave federation routes. Contributed by @nex. (#1623)
+- Fixed restricted joins not being signed when we are being used as an authorising server. Contributed by @nex, reported by [vel](matrix:u/vel:nhjkl.com?action=chat). (#1630)
+- Fixed room alias deletion so removing one local alias no longer removes other aliases from room alias listings.
+- Stopped left rooms from being unconditionally sent on initial sync, hopefully fixing spurious appearances of left rooms in some clients (and making sync faster as a bonus). Contributed by @ginger
+- Correct the response field name for MatrixRTC transports. Contributed by @spaetz
+
+## Improved Documentation
+
+- Added Testing and Troubleshooting instructions for Livekit documentation. Contributed by @stratself. (#1429)
+- Refactored docker docs to include new initial token workflow, and add Caddyfile example. Contributed by @stratself. (#1594)
+- Add DNS tuning guide for Continuwuity. Users are recommended to set up a local caching resolver following the guide's advice. Contributed by @stratself (#1601)
+
+## Misc
+
+- Fixed compiler warning in cf_opts.rs when building in release. Contributed by @ezera. (#1620)
+
+
 # Continuwuity 0.5.6 (2026-03-03)
 
 ## Security
diff --git a/changelog.d/+1770db35.feature.md b/changelog.d/+1770db35.feature.md
deleted file mode 100644
index df6f4c6b0..000000000
--- a/changelog.d/+1770db35.feature.md
+++ /dev/null
@@ -1 +0,0 @@
-Added support for associating email addresses with accounts, requiring email addresses for registration, and resetting passwords via email. Contributed by @ginger
diff --git a/changelog.d/+6368729a.feature.md b/changelog.d/+6368729a.feature.md
deleted file mode 100644
index 26ba608a2..000000000
--- a/changelog.d/+6368729a.feature.md
+++ /dev/null
@@ -1 +0,0 @@
-Added support for using an admin command to issue self-service password reset links.
diff --git a/changelog.d/+6e57599d.bugfix.md b/changelog.d/+6e57599d.bugfix.md
deleted file mode 100644
index d1d5ffc0f..000000000
--- a/changelog.d/+6e57599d.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-Stopped left rooms from being unconditionally sent on initial sync, hopefully fixing spurious appearances of left rooms in some clients (and making sync faster as a bonus). Contributed by @ginger
diff --git a/changelog.d/+7409b1db.feature.md b/changelog.d/+7409b1db.feature.md
deleted file mode 100644
index e1913ddd4..000000000
--- a/changelog.d/+7409b1db.feature.md
+++ /dev/null
@@ -1 +0,0 @@
-Added support for requiring users to accept terms and conditions when registering.
diff --git a/changelog.d/+alias-enumeration-delete.bugfix.md b/changelog.d/+alias-enumeration-delete.bugfix.md
deleted file mode 100644
index da9fbdae3..000000000
--- a/changelog.d/+alias-enumeration-delete.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-Fixed room alias deletion so removing one local alias no longer removes other aliases from room alias listings.
diff --git a/changelog.d/1265.bugfix b/changelog.d/1265.bugfix
deleted file mode 100644
index c3b836fdb..000000000
--- a/changelog.d/1265.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed corrupted appservice registrations causing the server to enter a crash loop. Contributed by @nex.
diff --git a/changelog.d/1371.feature.md b/changelog.d/1371.feature.md
deleted file mode 100644
index 0eed03fc8..000000000
--- a/changelog.d/1371.feature.md
+++ /dev/null
@@ -1 +0,0 @@
-Re-added support for reading registration tokens from a file. Contributed by @ginger and @benbot.
diff --git a/changelog.d/1429.doc b/changelog.d/1429.doc
deleted file mode 100644
index 2e7c1540e..000000000
--- a/changelog.d/1429.doc
+++ /dev/null
@@ -1 +0,0 @@
-Added Testing and Troubleshooting instructions for Livekit documentation. Contributed by @stratself.
diff --git a/changelog.d/1448.bugfix b/changelog.d/1448.bugfix
deleted file mode 100644
index a24db17dd..000000000
--- a/changelog.d/1448.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Prevent removing the admin room alias (`#admins`) to avoid accidentally breaking admin room functionality. Contributed by @0xnim
diff --git a/changelog.d/1527.feature.md b/changelog.d/1527.feature.md
deleted file mode 100644
index 3b48a809f..000000000
--- a/changelog.d/1527.feature.md
+++ /dev/null
@@ -1 +0,0 @@
-Add new config option to allow or disallow search engine indexing through a `<meta ../>` tag. Defaults to blocking indexing (`content="noindex"`). Contributed by @s1lv3r and @ginger.
diff --git a/changelog.d/1542.bugfix.md b/changelog.d/1542.bugfix.md
deleted file mode 100644
index f1f2965dd..000000000
--- a/changelog.d/1542.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-Stripped `join_authorised_via_users_server` from json if user is already in room (@partha:cxy.run)
diff --git a/changelog.d/1572.bugfix b/changelog.d/1572.bugfix
deleted file mode 100644
index 1e03faf9e..000000000
--- a/changelog.d/1572.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed internal server errors for fetching thumbnails. Contributed by @PerformativeJade
diff --git a/changelog.d/1579.bugfix b/changelog.d/1579.bugfix
deleted file mode 100644
index 5160a2a6e..000000000
--- a/changelog.d/1579.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed error 500 when joining non-existent rooms. Contributed by @ezera.
diff --git a/changelog.d/1594.doc b/changelog.d/1594.doc
deleted file mode 100644
index 9c8af2bfe..000000000
--- a/changelog.d/1594.doc
+++ /dev/null
@@ -1 +0,0 @@
-Refactored docker docs to include new initial token workflow, and add Caddyfile example. Contributed by @stratself.
diff --git a/changelog.d/1596.bugfix b/changelog.d/1596.bugfix
deleted file mode 100644
index e148cf6d9..000000000
--- a/changelog.d/1596.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Refactored nix package. Breaking, since `all-features` package no longer exists. Continuwuity is now built with jemalloc and liburing by default. Contributed by @Henry-Hiles (QuadRadical).
diff --git a/changelog.d/1601.doc b/changelog.d/1601.doc
deleted file mode 100644
index 6bfdc9743..000000000
--- a/changelog.d/1601.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add DNS tuning guide for Continuwuity. Users are recommended to set up a local caching resolver following the guide's advice. Contributed by @stratself
diff --git a/changelog.d/1609.feature.md b/changelog.d/1609.feature.md
deleted file mode 100644
index 746be3090..000000000
--- a/changelog.d/1609.feature.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Add new config option for [MSC4439](https://github.com/matrix-org/matrix-spec-proposals/pull/4439)
-PGP key URIs. Contributed by LogN.
diff --git a/changelog.d/1613.feature b/changelog.d/1613.feature
deleted file mode 100644
index 867eb5f74..000000000
--- a/changelog.d/1613.feature
+++ /dev/null
@@ -1 +0,0 @@
-Added `!admin users reset-push-rules` command to reset the notification settings of users. Contributed by @nex.
diff --git a/changelog.d/1614.feature b/changelog.d/1614.feature
deleted file mode 100644
index 9fd0c7963..000000000
--- a/changelog.d/1614.feature
+++ /dev/null
@@ -1 +0,0 @@
-Notification pushers are now automatically removed when their associated device is. Admin commands now exist for manual cleanup too. Contributed by @nex.
diff --git a/changelog.d/1615.bugfix b/changelog.d/1615.bugfix
deleted file mode 100644
index 2beb62330..000000000
--- a/changelog.d/1615.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed resolving IP of servers that only use SRV delegation. Contributed by @tulir.
diff --git a/changelog.d/1620.misc b/changelog.d/1620.misc
deleted file mode 100644
index e2099ce4b..000000000
--- a/changelog.d/1620.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fixed compiler warning in cf_opts.rs when building in release. Contributed by @ezera.
diff --git a/changelog.d/1623.bugfix b/changelog.d/1623.bugfix
deleted file mode 100644
index 9864c33fa..000000000
--- a/changelog.d/1623.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed "Sender must be a local user" error for make_join, make_knock, and make_leave federation routes. Contributed by @nex.
diff --git a/changelog.d/1624.feature b/changelog.d/1624.feature
deleted file mode 100644
index e6a5a0ff4..000000000
--- a/changelog.d/1624.feature
+++ /dev/null
@@ -1 +0,0 @@
-Implemented option to deprioritize servers for room join requests. Contributed by @ezera.
diff --git a/changelog.d/1629.feature.md b/changelog.d/1629.feature.md
deleted file mode 100644
index 72d5d9ce7..000000000
--- a/changelog.d/1629.feature.md
+++ /dev/null
@@ -1 +0,0 @@
-Added admin commands to get build information and features. Contributed by @Jade
diff --git a/changelog.d/1630.bugfix b/changelog.d/1630.bugfix
deleted file mode 100644
index d3e9f0c76..000000000
--- a/changelog.d/1630.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed restricted joins not being signed when we are being used as an authorising server. Contributed by @nex, reported by [vel](matrix:u/vel:nhjkl.com?action=chat).