diff --git a/CHANGES.md b/CHANGES.md
index 709436da9..0e451f983 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,67 @@
+Synapse 1.35.0rc1 (2021-05-25)
+==============================
+
+Features
+--------
+
+- Add experimental support to allow a user who could join a restricted room to view it in the spaces summary. ([\#9922](https://github.com/matrix-org/synapse/issues/9922), [\#10007](https://github.com/matrix-org/synapse/issues/10007), [\#10038](https://github.com/matrix-org/synapse/issues/10038))
+- Reduce memory usage when joining very large rooms over federation. ([\#9958](https://github.com/matrix-org/synapse/issues/9958))
+- Add a configuration option which allows enabling opentracing by user id. ([\#9978](https://github.com/matrix-org/synapse/issues/9978))
+- Enable experimental support for [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946) (spaces summary API) and [MSC3083](https://github.com/matrix-org/matrix-doc/pull/3083) (restricted join rules) by default. ([\#10011](https://github.com/matrix-org/synapse/issues/10011))
+
+
+Bugfixes
+--------
+
+- Fix a bug introduced in v1.26.0 which meant that `synapse_port_db` would not correctly initialise some postgres sequences, requiring manual updates afterwards. ([\#9991](https://github.com/matrix-org/synapse/issues/9991))
+- Fix `synctl`'s `--no-daemonize` parameter to work correctly with worker processes. ([\#9995](https://github.com/matrix-org/synapse/issues/9995))
+- Fix a validation bug introduced in v1.34.0 in the ordering of spaces in the space summary API. ([\#10002](https://github.com/matrix-org/synapse/issues/10002))
+- Fixed deletion of new presence stream states from database. ([\#10014](https://github.com/matrix-org/synapse/issues/10014), [\#10033](https://github.com/matrix-org/synapse/issues/10033))
+- Fixed a bug with very high resolution image uploads throwing internal server errors. ([\#10029](https://github.com/matrix-org/synapse/issues/10029))
+
+
+Updates to the Docker image
+---------------------------
+
+- Fix bug introduced in Synapse 1.33.0 which caused a `Permission denied: '/homeserver.log'` error when starting Synapse with the generated log configuration. Contributed by Sergio Miguéns Iglesias. ([\#10045](https://github.com/matrix-org/synapse/issues/10045))
+
+
+Improved Documentation
+----------------------
+
+- Add hardened systemd files as proposed in [#9760](https://github.com/matrix-org/synapse/issues/9760) and added them to `contrib/`. Change the docs to reflect the presence of these files. ([\#9803](https://github.com/matrix-org/synapse/issues/9803))
+- Clarify documentation around SSO mapping providers generating unique IDs and localparts. ([\#9980](https://github.com/matrix-org/synapse/issues/9980))
+- Updates to the PostgreSQL documentation (`postgres.md`). ([\#9988](https://github.com/matrix-org/synapse/issues/9988), [\#9989](https://github.com/matrix-org/synapse/issues/9989))
+- Fix broken link in user directory documentation. Contributed by @junquera. ([\#10016](https://github.com/matrix-org/synapse/issues/10016))
+- Add missing room state entry to the table of contents of room admin API. ([\#10043](https://github.com/matrix-org/synapse/issues/10043))
+
+
+Deprecations and Removals
+-------------------------
+
+- Removed support for the deprecated `tls_fingerprints` configuration setting. Contributed by Jerin J Titus. ([\#9280](https://github.com/matrix-org/synapse/issues/9280))
+
+
+Internal Changes
+----------------
+
+- Allow sending full presence to users via workers other than the one that called `ModuleApi.send_local_online_presence_to`. ([\#9823](https://github.com/matrix-org/synapse/issues/9823))
+- Update comments in the space summary handler. ([\#9974](https://github.com/matrix-org/synapse/issues/9974))
+- Minor enhancements to the `@cachedList` descriptor. ([\#9975](https://github.com/matrix-org/synapse/issues/9975))
+- Split multipart email sending into a dedicated handler. ([\#9977](https://github.com/matrix-org/synapse/issues/9977))
+- Run `black` on files in the `scripts` directory. ([\#9981](https://github.com/matrix-org/synapse/issues/9981))
+- Add missing type hints to `synapse.util` module. ([\#9982](https://github.com/matrix-org/synapse/issues/9982))
+- Simplify a few helper functions. ([\#9984](https://github.com/matrix-org/synapse/issues/9984), [\#9985](https://github.com/matrix-org/synapse/issues/9985), [\#9986](https://github.com/matrix-org/synapse/issues/9986))
+- Remove unnecessary property from SQLBaseStore. ([\#9987](https://github.com/matrix-org/synapse/issues/9987))
+- Remove `keylen` param on `LruCache`. ([\#9993](https://github.com/matrix-org/synapse/issues/9993))
+- Update the Grafana dashboard in `contrib/`. ([\#10001](https://github.com/matrix-org/synapse/issues/10001))
+- Add a batching queue implementation. ([\#10017](https://github.com/matrix-org/synapse/issues/10017))
+- Reduce memory usage when verifying signatures on large numbers of events at once. ([\#10018](https://github.com/matrix-org/synapse/issues/10018))
+- Properly invalidate caches for destination retry timings every (instead of expiring entries every 5 minutes). ([\#10036](https://github.com/matrix-org/synapse/issues/10036))
+- Fix running complement tests with Synapse workers. ([\#10039](https://github.com/matrix-org/synapse/issues/10039))
+- Fix typo in `get_state_ids_for_event` docstring where the return type was incorrect. ([\#10050](https://github.com/matrix-org/synapse/issues/10050))
+
+
 Synapse 1.34.0 (2021-05-17)
 ===========================
 
diff --git a/changelog.d/10001.misc b/changelog.d/10001.misc
deleted file mode 100644
index 8740cc478..000000000
--- a/changelog.d/10001.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update the Grafana dashboard in `contrib/`.
diff --git a/changelog.d/10002.bugfix b/changelog.d/10002.bugfix
deleted file mode 100644
index 1fabdad22..000000000
--- a/changelog.d/10002.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a validation bug introduced in v1.34.0 in the ordering of spaces in the space summary API.
diff --git a/changelog.d/10007.feature b/changelog.d/10007.feature
deleted file mode 100644
index 2c655350c..000000000
--- a/changelog.d/10007.feature
+++ /dev/null
@@ -1 +0,0 @@
-Experimental support to allow a user who could join a restricted room to view it in the spaces summary.
diff --git a/changelog.d/10011.feature b/changelog.d/10011.feature
deleted file mode 100644
index 409140fb1..000000000
--- a/changelog.d/10011.feature
+++ /dev/null
@@ -1 +0,0 @@
-Enable experimental support for [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946) (spaces summary API) and [MSC3083](https://github.com/matrix-org/matrix-doc/pull/3083) (restricted join rules) by default.
diff --git a/changelog.d/10014.bugfix b/changelog.d/10014.bugfix
deleted file mode 100644
index 7cf3603f9..000000000
--- a/changelog.d/10014.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed deletion of new presence stream states from database. 
diff --git a/changelog.d/10016.doc b/changelog.d/10016.doc
deleted file mode 100644
index f9b615d7d..000000000
--- a/changelog.d/10016.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix broken link in user directory documentation. Contributed by @junquera.
diff --git a/changelog.d/10017.misc b/changelog.d/10017.misc
deleted file mode 100644
index 4777b7fb5..000000000
--- a/changelog.d/10017.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a batching queue implementation.
diff --git a/changelog.d/10018.misc b/changelog.d/10018.misc
deleted file mode 100644
index eaf9f6486..000000000
--- a/changelog.d/10018.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce memory usage when verifying signatures on large numbers of events at once.
diff --git a/changelog.d/10029.bugfix b/changelog.d/10029.bugfix
deleted file mode 100644
index c214cbdae..000000000
--- a/changelog.d/10029.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a bug with very high resolution image uploads throwing internal server errors.
\ No newline at end of file
diff --git a/changelog.d/10033.bugfix b/changelog.d/10033.bugfix
deleted file mode 100644
index 587d839b8..000000000
--- a/changelog.d/10033.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed deletion of new presence stream states from database.
\ No newline at end of file
diff --git a/changelog.d/10036.misc b/changelog.d/10036.misc
deleted file mode 100644
index d2cf1e547..000000000
--- a/changelog.d/10036.misc
+++ /dev/null
@@ -1 +0,0 @@
-Properly invalidate caches for destination retry timings every (instead of expiring entries every 5 minutes).
diff --git a/changelog.d/10038.feature b/changelog.d/10038.feature
deleted file mode 100644
index 2c655350c..000000000
--- a/changelog.d/10038.feature
+++ /dev/null
@@ -1 +0,0 @@
-Experimental support to allow a user who could join a restricted room to view it in the spaces summary.
diff --git a/changelog.d/10039.misc b/changelog.d/10039.misc
deleted file mode 100644
index 8855f141d..000000000
--- a/changelog.d/10039.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix running complement tests with Synapse workers.
diff --git a/changelog.d/10043.doc b/changelog.d/10043.doc
deleted file mode 100644
index a574ec0bf..000000000
--- a/changelog.d/10043.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add missing room state entry to the table of contents of room admin API.
\ No newline at end of file
diff --git a/changelog.d/10045.docker b/changelog.d/10045.docker
deleted file mode 100644
index 70b65b0a0..000000000
--- a/changelog.d/10045.docker
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug introduced in Synapse 1.33.0 which caused a `Permission denied: '/homeserver.log'` error when starting Synapse with the generated log configuration. Contributed by Sergio Miguéns Iglesias.
diff --git a/changelog.d/10050.misc b/changelog.d/10050.misc
deleted file mode 100644
index 2cac953cc..000000000
--- a/changelog.d/10050.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix typo in `get_state_ids_for_event` docstring where the return type was incorrect.
diff --git a/changelog.d/9280.removal b/changelog.d/9280.removal
deleted file mode 100644
index c2ed3d308..000000000
--- a/changelog.d/9280.removal
+++ /dev/null
@@ -1 +0,0 @@
-Removed support for the deprecated `tls_fingerprints` configuration setting. Contributed by Jerin J Titus.
\ No newline at end of file
diff --git a/changelog.d/9803.doc b/changelog.d/9803.doc
deleted file mode 100644
index 16c7ba703..000000000
--- a/changelog.d/9803.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add hardened systemd files as proposed in [#9760](https://github.com/matrix-org/synapse/issues/9760) and added them to `contrib/`. Change the docs to reflect the presence of these files.
diff --git a/changelog.d/9823.misc b/changelog.d/9823.misc
deleted file mode 100644
index bf924ab68..000000000
--- a/changelog.d/9823.misc
+++ /dev/null
@@ -1 +0,0 @@
-Allow sending full presence to users via workers other than the one that called `ModuleApi.send_local_online_presence_to`.
\ No newline at end of file
diff --git a/changelog.d/9922.feature b/changelog.d/9922.feature
deleted file mode 100644
index 2c655350c..000000000
--- a/changelog.d/9922.feature
+++ /dev/null
@@ -1 +0,0 @@
-Experimental support to allow a user who could join a restricted room to view it in the spaces summary.
diff --git a/changelog.d/9958.feature b/changelog.d/9958.feature
deleted file mode 100644
index d86ba3651..000000000
--- a/changelog.d/9958.feature
+++ /dev/null
@@ -1 +0,0 @@
-Reduce memory usage when joining very large rooms over federation.
diff --git a/changelog.d/9974.misc b/changelog.d/9974.misc
deleted file mode 100644
index 9ddee2618..000000000
--- a/changelog.d/9974.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update comments in the space summary handler.
diff --git a/changelog.d/9975.misc b/changelog.d/9975.misc
deleted file mode 100644
index 28b1e40c2..000000000
--- a/changelog.d/9975.misc
+++ /dev/null
@@ -1 +0,0 @@
-Minor enhancements to the `@cachedList` descriptor.
diff --git a/changelog.d/9977.misc b/changelog.d/9977.misc
deleted file mode 100644
index 093dffc6b..000000000
--- a/changelog.d/9977.misc
+++ /dev/null
@@ -1 +0,0 @@
-Split multipart email sending into a dedicated handler.
diff --git a/changelog.d/9978.feature b/changelog.d/9978.feature
deleted file mode 100644
index 851adb9f6..000000000
--- a/changelog.d/9978.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a configuration option which allows enabling opentracing by user id.
diff --git a/changelog.d/9980.doc b/changelog.d/9980.doc
deleted file mode 100644
index d30ed0601..000000000
--- a/changelog.d/9980.doc
+++ /dev/null
@@ -1 +0,0 @@
-Clarify documentation around SSO mapping providers generating unique IDs and localparts.
diff --git a/changelog.d/9981.misc b/changelog.d/9981.misc
deleted file mode 100644
index 677c9b4cb..000000000
--- a/changelog.d/9981.misc
+++ /dev/null
@@ -1 +0,0 @@
-Run `black` on files in the `scripts` directory.
diff --git a/changelog.d/9982.misc b/changelog.d/9982.misc
deleted file mode 100644
index f3821f61a..000000000
--- a/changelog.d/9982.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add missing type hints to `synapse.util` module.
diff --git a/changelog.d/9984.misc b/changelog.d/9984.misc
deleted file mode 100644
index 97bd747f2..000000000
--- a/changelog.d/9984.misc
+++ /dev/null
@@ -1 +0,0 @@
-Simplify a few helper functions.
diff --git a/changelog.d/9985.misc b/changelog.d/9985.misc
deleted file mode 100644
index 97bd747f2..000000000
--- a/changelog.d/9985.misc
+++ /dev/null
@@ -1 +0,0 @@
-Simplify a few helper functions.
diff --git a/changelog.d/9986.misc b/changelog.d/9986.misc
deleted file mode 100644
index 97bd747f2..000000000
--- a/changelog.d/9986.misc
+++ /dev/null
@@ -1 +0,0 @@
-Simplify a few helper functions.
diff --git a/changelog.d/9987.misc b/changelog.d/9987.misc
deleted file mode 100644
index 02c088e3e..000000000
--- a/changelog.d/9987.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove unnecessary property from SQLBaseStore.
diff --git a/changelog.d/9988.doc b/changelog.d/9988.doc
deleted file mode 100644
index 25338c44c..000000000
--- a/changelog.d/9988.doc
+++ /dev/null
@@ -1 +0,0 @@
-Updates to the PostgreSQL documentation (`postgres.md`).
diff --git a/changelog.d/9989.doc b/changelog.d/9989.doc
deleted file mode 100644
index 25338c44c..000000000
--- a/changelog.d/9989.doc
+++ /dev/null
@@ -1 +0,0 @@
-Updates to the PostgreSQL documentation (`postgres.md`).
diff --git a/changelog.d/9991.bugfix b/changelog.d/9991.bugfix
deleted file mode 100644
index 665ff04de..000000000
--- a/changelog.d/9991.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in v1.26.0 which meant that `synapse_port_db` would not correctly initialise some postgres sequences, requiring manual updates afterwards.
diff --git a/changelog.d/9993.misc b/changelog.d/9993.misc
deleted file mode 100644
index 0dd924407..000000000
--- a/changelog.d/9993.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove `keylen` param on `LruCache`.
diff --git a/changelog.d/9995.bugfix b/changelog.d/9995.bugfix
deleted file mode 100644
index 3b63e7c42..000000000
--- a/changelog.d/9995.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix `synctl`'s `--no-daemonize` parameter to work correctly with worker processes.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 7498a6016..e60e9db71 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.34.0"
+__version__ = "1.35.0rc1"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when