6 files changed, 24 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md
index cbd8f1062e..8279960b5b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,20 @@
+# Synapse 1.111.0rc2 (2024-07-10)
+
+### Bugfixes
+
+- Fix bug where using `synapse.app.media_repository` worker configuration would break the new media endpoints. ([\#17420](https://github.com/element-hq/synapse/issues/17420))
+
+### Improved Documentation
+
+- Document the new federation media worker endpoints in the [upgrade notes](https://element-hq.github.io/synapse/v1.111/upgrade.html) and [worker docs](https://element-hq.github.io/synapse/v1.111/workers.html). ([\#17421](https://github.com/element-hq/synapse/issues/17421))
+
+### Internal Changes
+
+- Route authenticated federation media requests to media repository workers in Complement tests. ([\#17422](https://github.com/element-hq/synapse/issues/17422))
+
+
+
+
 # Synapse 1.111.0rc1 (2024-07-09)
 
 ### Features
diff --git a/changelog.d/17420.bugfix b/changelog.d/17420.bugfix
deleted file mode 100644
index 343f9b9331..0000000000
--- a/changelog.d/17420.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where using `synapse.app.media_repository` worker configuration would break the new media endpoints.
diff --git a/changelog.d/17421.doc b/changelog.d/17421.doc
deleted file mode 100644
index e6a495e5d6..0000000000
--- a/changelog.d/17421.doc
+++ /dev/null
@@ -1 +0,0 @@
-Document the new federation media worker endpoints in the [upgrade notes](https://element-hq.github.io/synapse/v1.111/upgrade.html) and [worker docs](https://element-hq.github.io/synapse/v1.111/workers.html).
\ No newline at end of file
diff --git a/changelog.d/17422.misc b/changelog.d/17422.misc
deleted file mode 100644
index 1f53e3c579..0000000000
--- a/changelog.d/17422.misc
+++ /dev/null
@@ -1 +0,0 @@
-Route authenticated federation media requests to media repository workers in Complement tests.
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 5fc9e10a29..0f3dcc64e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.111.0~rc2) stable; urgency=medium
+
+  * New synapse release 1.111.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 10 Jul 2024 08:46:54 +0000
+
 matrix-synapse-py3 (1.111.0~rc1) stable; urgency=medium
 
   * New synapse release 1.111.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 0b1f03bb81..41de90f9f6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -97,7 +97,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.111.0rc1"
+version = "1.111.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"