diff --git a/CHANGES.md b/CHANGES.md
index c6c2807cee..19f8ef54cd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,29 @@
+# Synapse 1.136.0rc2 (2025-08-11)
+
+This is the Synapse portion of the [Matrix coordinated security release](https://matrix.org/blog/2025/07/security-predisclosure/). This release includes support for [room version](https://spec.matrix.org/v1.15/rooms/) 12 which fixes a number of security vulnerabilities, including [CVE-2025-49090](https://www.cve.org/CVERecord?id=CVE-2025-49090).
+
+The default room version is not changed. Not all clients will support room version 12 immediately, and not all users will be using the latest version of their clients. Large, public rooms are advised to wait a few weeks before upgrading to room version 12 to allow users throughout the Matrix ecosystem to update their clients.
+
+Note: release 1.135.1 was skipped due to issues discovered during the release process.
+
+Two patched Synapse releases are now available:
+
+* `1.135.2`: stable release comprised of `1.135.0` + security patches
+    * Upgrade to this release **if you are currently running 1.135.0 or below**.
+* `1.136.0rc2`: unstable release candidate comprised of `1.136.0rc1` + security patches.
+    * Upgrade to this release **only if you are on 1.136.0rc1**.
+
+### Bugfixes
+
+- Update MSC4293 redaction logic for room v12. ([\#80](https://github.com/element-hq/synapse/issues/80))
+
+### Internal Changes
+
+- Add a parameter to `upgrade_rooms(..)` to allow auto join local users. ([\#83](https://github.com/element-hq/synapse/issues/83))
+
+
+
+
 # Synapse 1.136.0rc1 (2025-08-05)
 
 Please check [the relevant section in the upgrade notes](https://github.com/element-hq/synapse/blob/develop/docs/upgrade.md#upgrading-to-v11360) as this release contains changes to MAS support, metrics labels and the module API which may require your attention when upgrading.
diff --git a/changelog.d/80.bugfix b/changelog.d/80.bugfix
deleted file mode 100644
index 9cb9020901..0000000000
--- a/changelog.d/80.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Update MSC4293 redaction logic for room v12.
diff --git a/changelog.d/83.misc b/changelog.d/83.misc
deleted file mode 100644
index fad525272f..0000000000
--- a/changelog.d/83.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a parameter to `upgrade_rooms(..)` to allow auto join local users.
diff --git a/debian/changelog b/debian/changelog
index 3a6b5b212d..0b566b4329 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.136.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.136.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Mon, 11 Aug 2025 12:18:52 -0600
+
 matrix-synapse-py3 (1.136.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.136.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index b270edb6be..ba82347bc7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -101,7 +101,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.136.0rc1"
+version = "1.136.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"