diff --git a/CHANGES.md b/CHANGES.md
index 9c200bfb7..9e497b1b8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,80 @@
+Synapse 1.84.0rc1 (2023-05-16)
+==============================
+
+Features
+--------
+
+- Add an option to prevent media downloads from configured domains. ([\#15197](https://github.com/matrix-org/synapse/issues/15197))
+- Add `forget_rooms_on_leave` config option to automatically forget rooms when users leave them or are removed from them. ([\#15224](https://github.com/matrix-org/synapse/issues/15224))
+- Add redis TLS configuration options. ([\#15312](https://github.com/matrix-org/synapse/issues/15312))
+- Add a config option to delay push notifications by a random amount, to discourage time-based profiling. ([\#15516](https://github.com/matrix-org/synapse/issues/15516))
+- Stabilize support for [MSC2659](https://github.com/matrix-org/matrix-spec-proposals/pull/2659): application service ping endpoint. Contributed by Tulir @ Beeper. ([\#15528](https://github.com/matrix-org/synapse/issues/15528))
+- Implement [MSC4009](https://github.com/matrix-org/matrix-spec-proposals/pull/4009) to expand the supported characters in Matrix IDs. ([\#15536](https://github.com/matrix-org/synapse/issues/15536))
+- Advertise support for Matrix 1.6 on `/_matrix/client/versions`. ([\#15559](https://github.com/matrix-org/synapse/issues/15559))
+- Print full error and stack-trace of any exception that occurs during startup/initialization. ([\#15569](https://github.com/matrix-org/synapse/issues/15569))
+
+
+Bugfixes
+--------
+
+- Don't fail on federation over TOR where SRV queries are not supported. Contributed by Zdzichu. ([\#15523](https://github.com/matrix-org/synapse/issues/15523))
+- Experimental support for [MSC4010](https://github.com/matrix-org/matrix-spec-proposals/pull/4010) which rejects setting the `"m.push_rules"` via account data. ([\#15554](https://github.com/matrix-org/synapse/issues/15554), [\#15555](https://github.com/matrix-org/synapse/issues/15555))
+- Fix a long-standing bug where an invalid membership event could cause an internal server error. ([\#15564](https://github.com/matrix-org/synapse/issues/15564))
+- Require at least poetry-core v1.1.0. ([\#15566](https://github.com/matrix-org/synapse/issues/15566), [\#15571](https://github.com/matrix-org/synapse/issues/15571))
+
+
+Updates to the Docker image
+---------------------------
+
+- Add pkg-config package to Stage 0 to be able to build Dockerfile on ppc64le architecture. ([\#15567](https://github.com/matrix-org/synapse/issues/15567))
+
+
+Improved Documentation
+----------------------
+
+- Clarify documentation of the "Create or modify account" Admin API. ([\#15544](https://github.com/matrix-org/synapse/issues/15544))
+- Fix path to the `statistics/database/rooms` admin API in documentation. ([\#15560](https://github.com/matrix-org/synapse/issues/15560))
+- Update and improve Mastodon Single Sign-On documentation. ([\#15587](https://github.com/matrix-org/synapse/issues/15587))
+
+
+Internal Changes
+----------------
+
+- Use oEmbed to generate URL previews for YouTube Shorts. ([\#15025](https://github.com/matrix-org/synapse/issues/15025))
+- Create new `Client` for use with HTTP Replication between workers. Contributed by Jason Little. ([\#15470](https://github.com/matrix-org/synapse/issues/15470))
+- Remove need for `worker_replication_*` based settings in worker configuration yaml by placing this data directly on the `instance_map` instead. ([\#15491](https://github.com/matrix-org/synapse/issues/15491))
+- Bump pyicu from 2.10.2 to 2.11. ([\#15509](https://github.com/matrix-org/synapse/issues/15509))
+- Remove references to supporting per-user flag for [MSC2654](https://github.com/matrix-org/matrix-spec-proposals/pull/2654). ([\#15522](https://github.com/matrix-org/synapse/issues/15522))
+- Don't use a trusted key server when running the demo scripts. ([\#15527](https://github.com/matrix-org/synapse/issues/15527))
+- Speed up rebuilding of the user directory for local users. ([\#15529](https://github.com/matrix-org/synapse/issues/15529))
+- Speed up deleting of old rows in `event_push_actions`. ([\#15531](https://github.com/matrix-org/synapse/issues/15531))
+- Install the `xmlsec` and `mdbook` packages and switch back to the upstream [cachix/devenv](https://github.com/cachix/devenv) repo in the nix development environment. ([\#15532](https://github.com/matrix-org/synapse/issues/15532), [\#15533](https://github.com/matrix-org/synapse/issues/15533), [\#15545](https://github.com/matrix-org/synapse/issues/15545))
+- Implement [MSC3987](https://github.com/matrix-org/matrix-spec-proposals/pull/3987) by removing `"dont_notify"` from the list of actions in default push rules. ([\#15534](https://github.com/matrix-org/synapse/issues/15534))
+- Move various module API callback registration methods to a dedicated class. ([\#15535](https://github.com/matrix-org/synapse/issues/15535))
+- Proxy `/user/devices` federation queries to application services for [MSC3984](https://github.com/matrix-org/matrix-spec-proposals/pull/3984). ([\#15539](https://github.com/matrix-org/synapse/issues/15539))
+- Factor out an `is_mine_server_name` method. ([\#15542](https://github.com/matrix-org/synapse/issues/15542))
+- Allow running Complement tests using [podman](https://podman.io/) by adding a `PODMAN` environment variable to `scripts-dev/complement.sh`. ([\#15543](https://github.com/matrix-org/synapse/issues/15543))
+- Bump serde from 1.0.160 to 1.0.162. ([\#15548](https://github.com/matrix-org/synapse/issues/15548))
+- Bump types-setuptools from 67.6.0.5 to 67.7.0.1. ([\#15549](https://github.com/matrix-org/synapse/issues/15549))
+- Bump sentry-sdk from 1.19.1 to 1.22.1. ([\#15550](https://github.com/matrix-org/synapse/issues/15550))
+- Bump ruff from 0.0.259 to 0.0.265. ([\#15551](https://github.com/matrix-org/synapse/issues/15551))
+- Bump hiredis from 2.2.2 to 2.2.3. ([\#15552](https://github.com/matrix-org/synapse/issues/15552))
+- Bump types-requests from 2.29.0.0 to 2.30.0.0. ([\#15553](https://github.com/matrix-org/synapse/issues/15553))
+- Add `org.matrix.msc3981` info to `client/versions`. ([\#15558](https://github.com/matrix-org/synapse/issues/15558))
+- Declare unstable support for [MSC3391](https://github.com/matrix-org/matrix-spec-proposals/pull/3391) under `/_matrix/client/versions` if the experimental implementation is enabled. ([\#15562](https://github.com/matrix-org/synapse/issues/15562))
+- Implement [MSC3821](https://github.com/matrix-org/matrix-spec-proposals/pull/3821) to update the redaction rules. ([\#15563](https://github.com/matrix-org/synapse/issues/15563))
+- Implement updated redaction rules from [MSC3389](https://github.com/matrix-org/matrix-spec-proposals/pull/3389). ([\#15565](https://github.com/matrix-org/synapse/issues/15565))
+- Allow `pip install` to use setuptools_rust 1.6.0 when building Synapse. ([\#15570](https://github.com/matrix-org/synapse/issues/15570))
+- Deal with upcoming Github Actions deprecations. ([\#15576](https://github.com/matrix-org/synapse/issues/15576))
+- Export `run_as_background_process` from the module API. ([\#15577](https://github.com/matrix-org/synapse/issues/15577))
+- Update build system requirements to allow building with poetry-core==1.6.0. ([\#15588](https://github.com/matrix-org/synapse/issues/15588))
+- Bump serde from 1.0.162 to 1.0.163. ([\#15589](https://github.com/matrix-org/synapse/issues/15589))
+- Bump phonenumbers from 8.13.7 to 8.13.11. ([\#15590](https://github.com/matrix-org/synapse/issues/15590))
+- Bump types-psycopg2 from 2.9.21.9 to 2.9.21.10. ([\#15591](https://github.com/matrix-org/synapse/issues/15591))
+- Bump types-commonmark from 0.9.2.2 to 0.9.2.3. ([\#15592](https://github.com/matrix-org/synapse/issues/15592))
+- Bump types-setuptools from 67.7.0.1 to 67.7.0.2. ([\#15594](https://github.com/matrix-org/synapse/issues/15594))
+
+
 Synapse 1.83.0 (2023-05-09)
 ===========================
 
diff --git a/changelog.d/15025.misc b/changelog.d/15025.misc
deleted file mode 100644
index 1f04d8572..000000000
--- a/changelog.d/15025.misc
+++ /dev/null
@@ -1 +0,0 @@
-Use oEmbed to generate URL previews for YouTube Shorts.
diff --git a/changelog.d/15197.feature b/changelog.d/15197.feature
deleted file mode 100644
index c8a6f114e..000000000
--- a/changelog.d/15197.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add an option to prevent media downloads from configured domains.
\ No newline at end of file
diff --git a/changelog.d/15224.feature b/changelog.d/15224.feature
deleted file mode 100644
index 5d8413f8b..000000000
--- a/changelog.d/15224.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add `forget_rooms_on_leave` config option to automatically forget rooms when users leave them or are removed from them.
diff --git a/changelog.d/15312.feature b/changelog.d/15312.feature
deleted file mode 100644
index e4e972cfe..000000000
--- a/changelog.d/15312.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add redis TLS configuration options.
\ No newline at end of file
diff --git a/changelog.d/15470.misc b/changelog.d/15470.misc
deleted file mode 100644
index 0af0b499c..000000000
--- a/changelog.d/15470.misc
+++ /dev/null
@@ -1 +0,0 @@
-Create new `Client` for use with HTTP Replication between workers. Contributed by Jason Little.
diff --git a/changelog.d/15491.misc b/changelog.d/15491.misc
deleted file mode 100644
index 98f88dbf1..000000000
--- a/changelog.d/15491.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove need for `worker_replication_*` based settings in worker configuration yaml by placing this data directly on the `instance_map` instead.
diff --git a/changelog.d/15509.misc b/changelog.d/15509.misc
deleted file mode 100644
index 1eb26c83b..000000000
--- a/changelog.d/15509.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump pyicu from 2.10.2 to 2.11.
diff --git a/changelog.d/15516.feature b/changelog.d/15516.feature
deleted file mode 100644
index 02a101bb8..000000000
--- a/changelog.d/15516.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a config option to delay push notifications by a random amount, to discourage time-based profiling.
diff --git a/changelog.d/15522.misc b/changelog.d/15522.misc
deleted file mode 100644
index a5a229e4a..000000000
--- a/changelog.d/15522.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove references to supporting per-user flag for [MSC2654](https://github.com/matrix-org/matrix-spec-proposals/pull/2654) (#15522).
diff --git a/changelog.d/15523.bugfix b/changelog.d/15523.bugfix
deleted file mode 100644
index c00754019..000000000
--- a/changelog.d/15523.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Don't fail on federation over TOR where SRV queries are not supported. Contributed by Zdzichu.
diff --git a/changelog.d/15527.misc b/changelog.d/15527.misc
deleted file mode 100644
index 752a32ade..000000000
--- a/changelog.d/15527.misc
+++ /dev/null
@@ -1 +0,0 @@
-Don't use a trusted key server when running the demo scripts.
\ No newline at end of file
diff --git a/changelog.d/15528.feature b/changelog.d/15528.feature
deleted file mode 100644
index aae9fa1ec..000000000
--- a/changelog.d/15528.feature
+++ /dev/null
@@ -1 +0,0 @@
-Stabilize support for [MSC2659](https://github.com/matrix-org/matrix-spec-proposals/pull/2659): application service ping endpoint. Contributed by Tulir @ Beeper.
diff --git a/changelog.d/15529.misc b/changelog.d/15529.misc
deleted file mode 100644
index 7ad424d8d..000000000
--- a/changelog.d/15529.misc
+++ /dev/null
@@ -1 +0,0 @@
-Speed up rebuilding of the user directory for local users.
diff --git a/changelog.d/15531.misc b/changelog.d/15531.misc
deleted file mode 100644
index 6d4da961b..000000000
--- a/changelog.d/15531.misc
+++ /dev/null
@@ -1 +0,0 @@
-Speed up deleting of old rows in `event_push_actions`.
diff --git a/changelog.d/15532.misc b/changelog.d/15532.misc
deleted file mode 100644
index 1ee700f82..000000000
--- a/changelog.d/15532.misc
+++ /dev/null
@@ -1 +0,0 @@
-Install the `xmlsec` and `mdbook` packages and switch back to the upstream [cachix/devenv](https://github.com/cachix/devenv) repo in the nix development environment.
diff --git a/changelog.d/15533.misc b/changelog.d/15533.misc
deleted file mode 100644
index 1ee700f82..000000000
--- a/changelog.d/15533.misc
+++ /dev/null
@@ -1 +0,0 @@
-Install the `xmlsec` and `mdbook` packages and switch back to the upstream [cachix/devenv](https://github.com/cachix/devenv) repo in the nix development environment.
diff --git a/changelog.d/15534.misc b/changelog.d/15534.misc
deleted file mode 100644
index fd9ba2a6e..000000000
--- a/changelog.d/15534.misc
+++ /dev/null
@@ -1 +0,0 @@
-Implement [MSC3987](https://github.com/matrix-org/matrix-spec-proposals/pull/3987) by removing `"dont_notify"` from the list of actions in default push rules.
diff --git a/changelog.d/15535.misc b/changelog.d/15535.misc
deleted file mode 100644
index 9981606c3..000000000
--- a/changelog.d/15535.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move various module API callback registration methods to a dedicated class.
\ No newline at end of file
diff --git a/changelog.d/15536.feature b/changelog.d/15536.feature
deleted file mode 100644
index 824c24575..000000000
--- a/changelog.d/15536.feature
+++ /dev/null
@@ -1 +0,0 @@
-Implement [MSC4009](https://github.com/matrix-org/matrix-spec-proposals/pull/4009) to expand the supported characters in Matrix IDs.
diff --git a/changelog.d/15539.misc b/changelog.d/15539.misc
deleted file mode 100644
index e5af5dee5..000000000
--- a/changelog.d/15539.misc
+++ /dev/null
@@ -1 +0,0 @@
-Proxy `/user/devices` federation queries to application services for [MSC3984](https://github.com/matrix-org/matrix-spec-proposals/pull/3984).
diff --git a/changelog.d/15542.misc b/changelog.d/15542.misc
deleted file mode 100644
index 32e3d678a..000000000
--- a/changelog.d/15542.misc
+++ /dev/null
@@ -1 +0,0 @@
-Factor out an `is_mine_server_name` method.
diff --git a/changelog.d/15543.misc b/changelog.d/15543.misc
deleted file mode 100644
index ba1dc7597..000000000
--- a/changelog.d/15543.misc
+++ /dev/null
@@ -1 +0,0 @@
-Allow running Complement tests using [podman](https://podman.io/) by adding a `PODMAN` environment variable to `scripts-dev/complement.sh`.
\ No newline at end of file
diff --git a/changelog.d/15544.doc b/changelog.d/15544.doc
deleted file mode 100644
index a6d1e9690..000000000
--- a/changelog.d/15544.doc
+++ /dev/null
@@ -1 +0,0 @@
-Clarify documentation of the "Create or modify account" Admin API.
\ No newline at end of file
diff --git a/changelog.d/15545.misc b/changelog.d/15545.misc
deleted file mode 100644
index c7c0741f9..000000000
--- a/changelog.d/15545.misc
+++ /dev/null
@@ -1 +0,0 @@
- Install the `xmlsec` and `mdbook` packages and switch back to the upstream [cachix/devenv](https://github.com/cachix/devenv) repo in the nix development environment.
\ No newline at end of file
diff --git a/changelog.d/15548.misc b/changelog.d/15548.misc
deleted file mode 100644
index e05ddde43..000000000
--- a/changelog.d/15548.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump serde from 1.0.160 to 1.0.162.
diff --git a/changelog.d/15549.misc b/changelog.d/15549.misc
deleted file mode 100644
index 70573688d..000000000
--- a/changelog.d/15549.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump types-setuptools from 67.6.0.5 to 67.7.0.1.
diff --git a/changelog.d/15550.misc b/changelog.d/15550.misc
deleted file mode 100644
index 58d5594e7..000000000
--- a/changelog.d/15550.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump sentry-sdk from 1.19.1 to 1.22.1.
diff --git a/changelog.d/15551.misc b/changelog.d/15551.misc
deleted file mode 100644
index a8bedbe0e..000000000
--- a/changelog.d/15551.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump ruff from 0.0.259 to 0.0.265.
diff --git a/changelog.d/15552.misc b/changelog.d/15552.misc
deleted file mode 100644
index 24972a2f8..000000000
--- a/changelog.d/15552.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump hiredis from 2.2.2 to 2.2.3.
diff --git a/changelog.d/15553.misc b/changelog.d/15553.misc
deleted file mode 100644
index ca9eafd6c..000000000
--- a/changelog.d/15553.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump types-requests from 2.29.0.0 to 2.30.0.0.
diff --git a/changelog.d/15554.bugfix b/changelog.d/15554.bugfix
deleted file mode 100644
index 0fd9de8c6..000000000
--- a/changelog.d/15554.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Experimental support for [MSC4010](https://github.com/matrix-org/matrix-spec-proposals/pull/4010) which rejects setting the `"m.push_rules"` via account data.
diff --git a/changelog.d/15555.bugfix b/changelog.d/15555.bugfix
deleted file mode 100644
index 0fd9de8c6..000000000
--- a/changelog.d/15555.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Experimental support for [MSC4010](https://github.com/matrix-org/matrix-spec-proposals/pull/4010) which rejects setting the `"m.push_rules"` via account data.
diff --git a/changelog.d/15558.misc b/changelog.d/15558.misc
deleted file mode 100644
index a7cfee251..000000000
--- a/changelog.d/15558.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add `org.matrix.msc3981` info to `client/versions`.
diff --git a/changelog.d/15559.feature b/changelog.d/15559.feature
deleted file mode 100644
index 07f729e38..000000000
--- a/changelog.d/15559.feature
+++ /dev/null
@@ -1 +0,0 @@
-Advertise support for Matrix 1.6 on `/_matrix/client/versions`.
diff --git a/changelog.d/15560.doc b/changelog.d/15560.doc
deleted file mode 100644
index a55239188..000000000
--- a/changelog.d/15560.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix path to the `statistics/database/rooms` admin API in documentation.
diff --git a/changelog.d/15562.misc b/changelog.d/15562.misc
deleted file mode 100644
index eeeb553d8..000000000
--- a/changelog.d/15562.misc
+++ /dev/null
@@ -1 +0,0 @@
-Declare unstable support for [MSC3391](https://github.com/matrix-org/matrix-spec-proposals/pull/3391) under `/_matrix/client/versions` if the experimental implementation is enabled.
\ No newline at end of file
diff --git a/changelog.d/15563.misc b/changelog.d/15563.misc
deleted file mode 100644
index 8bfecf2b9..000000000
--- a/changelog.d/15563.misc
+++ /dev/null
@@ -1 +0,0 @@
-Implement [MSC3821](https://github.com/matrix-org/matrix-spec-proposals/pull/3821) to update the redaction rules.
diff --git a/changelog.d/15564.bugfix b/changelog.d/15564.bugfix
deleted file mode 100644
index 667114ba4..000000000
--- a/changelog.d/15564.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where an invalid membership event could cause an internal server error.
diff --git a/changelog.d/15565.misc b/changelog.d/15565.misc
deleted file mode 100644
index 5adc1aab9..000000000
--- a/changelog.d/15565.misc
+++ /dev/null
@@ -1 +0,0 @@
-Implement updated redaction rules from [MSC3389](https://github.com/matrix-org/matrix-spec-proposals/pull/3389).
diff --git a/changelog.d/15566.bugfix b/changelog.d/15566.bugfix
deleted file mode 100644
index 130342590..000000000
--- a/changelog.d/15566.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Require at least poetry-core v1.1.0.
diff --git a/changelog.d/15567.docker b/changelog.d/15567.docker
deleted file mode 100644
index 8995bc1bd..000000000
--- a/changelog.d/15567.docker
+++ /dev/null
@@ -1 +0,0 @@
-Add pkg-config package to Stage 0 to be able to build Dockerfile on ppc64le architecture.
diff --git a/changelog.d/15569.feature b/changelog.d/15569.feature
deleted file mode 100644
index b58af8ad5..000000000
--- a/changelog.d/15569.feature
+++ /dev/null
@@ -1 +0,0 @@
-Print full error and stack-trace of any exception that occurs during startup/initialization.
diff --git a/changelog.d/15570.misc b/changelog.d/15570.misc
deleted file mode 100644
index ee0450998..000000000
--- a/changelog.d/15570.misc
+++ /dev/null
@@ -1 +0,0 @@
-Allow `pip install` to use setuptools_rust 1.6.0 when building Synapse.
diff --git a/changelog.d/15571.bugfix b/changelog.d/15571.bugfix
deleted file mode 100644
index 130342590..000000000
--- a/changelog.d/15571.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Require at least poetry-core v1.1.0.
diff --git a/changelog.d/15576.misc b/changelog.d/15576.misc
deleted file mode 100644
index 9df71999d..000000000
--- a/changelog.d/15576.misc
+++ /dev/null
@@ -1 +0,0 @@
-Deal with upcoming Github Actions deprecations.
diff --git a/changelog.d/15577.misc b/changelog.d/15577.misc
deleted file mode 100644
index 74a7f495d..000000000
--- a/changelog.d/15577.misc
+++ /dev/null
@@ -1 +0,0 @@
-Export `run_as_background_process` from the module API.
diff --git a/changelog.d/15587.doc b/changelog.d/15587.doc
deleted file mode 100644
index b0d768b46..000000000
--- a/changelog.d/15587.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update and improve Mastodon Single Sign-On documentation.
diff --git a/changelog.d/15588.misc b/changelog.d/15588.misc
deleted file mode 100644
index 857435984..000000000
--- a/changelog.d/15588.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update build system requirements to allow building with poetry-core==1.6.0.
diff --git a/changelog.d/15589.misc b/changelog.d/15589.misc
deleted file mode 100644
index e055add92..000000000
--- a/changelog.d/15589.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump serde from 1.0.162 to 1.0.163.
diff --git a/changelog.d/15590.misc b/changelog.d/15590.misc
deleted file mode 100644
index a3ed116c4..000000000
--- a/changelog.d/15590.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump phonenumbers from 8.13.7 to 8.13.11.
diff --git a/changelog.d/15591.misc b/changelog.d/15591.misc
deleted file mode 100644
index 82584b1f7..000000000
--- a/changelog.d/15591.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump types-psycopg2 from 2.9.21.9 to 2.9.21.10.
diff --git a/changelog.d/15592.misc b/changelog.d/15592.misc
deleted file mode 100644
index 7f9160607..000000000
--- a/changelog.d/15592.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump types-commonmark from 0.9.2.2 to 0.9.2.3.
diff --git a/changelog.d/15594.misc b/changelog.d/15594.misc
deleted file mode 100644
index bf6810b4e..000000000
--- a/changelog.d/15594.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump types-setuptools from 67.7.0.1 to 67.7.0.2.
diff --git a/debian/changelog b/debian/changelog
index 15ff7e82c..ad163add2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.84.0~rc1) stable; urgency=medium
+
+  * New Synapse release 1.84.0rc1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 16 May 2023 11:12:02 +0100
+
 matrix-synapse-py3 (1.83.0) stable; urgency=medium
 
   * New Synapse release 1.83.0.
diff --git a/pyproject.toml b/pyproject.toml
index 6471c1a40..86e1537a6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -89,7 +89,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.83.0"
+version = "1.84.0rc1"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"