6 files changed, 25 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md
index d8ecb11e4e..b65cf00f4f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,21 @@
+Synapse 1.58.0rc2 (2022-04-26)
+==============================
+
+This release candidate fixes bugs related to Synapse 1.58.0rc1's logic for handling device list updates.
+
+Bugfixes
+--------
+
+- Fix a bug introduced in Synapse 1.58.0rc1 where the main process could consume excessive amounts of CPU and memory handling sentry logging failures. ([\#12554](https://github.com/matrix-org/synapse/issues/12554))
+- Fix a bug introduced in Synapse 1.58.0rc1 where opentracing contexts were not correctly sent to whitelisted remote servers with device lists updates. ([\#12555](https://github.com/matrix-org/synapse/issues/12555))
+
+
+Internal Changes
+----------------
+
+- Reduce unnecessary work when handling remote device list updates. ([\#12557](https://github.com/matrix-org/synapse/issues/12557))
+
+
 Synapse 1.58.0rc1 (2022-04-26)
 ==============================
 
diff --git a/changelog.d/12554.bugfix b/changelog.d/12554.bugfix
deleted file mode 100644
index 48c1146db5..0000000000
--- a/changelog.d/12554.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.58.0rc1 where the main process could consume excessive amounts of CPU and memory handling sentry logging failures.
diff --git a/changelog.d/12555.bugfix b/changelog.d/12555.bugfix
deleted file mode 100644
index 3c721da1ee..0000000000
--- a/changelog.d/12555.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix sending opentracing contexts to whitelisted remote servers with device lists updates. Broken in v1.58.0rc1.
diff --git a/changelog.d/12557.misc b/changelog.d/12557.misc
deleted file mode 100644
index e4eb895ef5..0000000000
--- a/changelog.d/12557.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce unnecessary work when handling remote device list updates.
diff --git a/debian/changelog b/debian/changelog
index 20e756f6db..5f1bf872bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.58.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.58.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 26 Apr 2022 17:14:56 +0100
+
 matrix-synapse-py3 (1.58.0~rc1) stable; urgency=medium
 
   * Use poetry to manage the bundled virtualenv included with this package.
diff --git a/pyproject.toml b/pyproject.toml
index cc4908fa23..bdded78434 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ skip_gitignore = true
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.58.0rc1"
+version = "1.58.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"