diff --git a/CHANGES.md b/CHANGES.md
index 329e59d39..e4710a506 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,20 @@
+Synapse 1.1.0rc2 (2019-07-03)
+=============================
+
+Bugfixes
+--------
+
+- Fix regression in 1.1rc1 where OPTIONS requests to the media repo would fail. ([\#5593](https://github.com/matrix-org/synapse/issues/5593))
+- Removed the `SYNAPSE_SMTP_*` docker container environment variables. Using these environment variables prevented the docker container from starting in Synapse v1.0, even though they didn't actually allow any functionality anyway. Users are advised to remove `SYNAPSE_SMTP_HOST`, `SYNAPSE_SMTP_PORT`, `SYNAPSE_SMTP_USER`, `SYNAPSE_SMTP_PASSWORD` and `SYNAPSE_SMTP_FROM` environment variables from their docker run commands. ([\#5596](https://github.com/matrix-org/synapse/issues/5596))
+- Fix a number of "Starting txn from sentinel context" warnings. ([\#5605](https://github.com/matrix-org/synapse/issues/5605))
+
+
+Internal Changes
+----------------
+
+- Update github templates. ([\#5552](https://github.com/matrix-org/synapse/issues/5552))
+
+
 Synapse 1.1.0rc1 (2019-07-02)
 =============================
 
diff --git a/changelog.d/5552.misc b/changelog.d/5552.misc
deleted file mode 100644
index 77f480e88..000000000
--- a/changelog.d/5552.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update github templates.
diff --git a/changelog.d/5593.bugfix b/changelog.d/5593.bugfix
deleted file mode 100644
index e981589ac..000000000
--- a/changelog.d/5593.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix regression in 1.1rc1 where OPTIONS requests to the media repo would fail.
diff --git a/changelog.d/5596.bugfix b/changelog.d/5596.bugfix
deleted file mode 100644
index da7ca1ed8..000000000
--- a/changelog.d/5596.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Removed the `SYNAPSE_SMTP_*` docker container environment variables. Using these environment variables prevented the docker container from starting in Synapse v1.0, even though they didn't actually allow any functionality anyway. Users are advised to remove `SYNAPSE_SMTP_HOST`, `SYNAPSE_SMTP_PORT`, `SYNAPSE_SMTP_USER`, `SYNAPSE_SMTP_PASSWORD` and `SYNAPSE_SMTP_FROM` environment variables from their docker run commands.
diff --git a/changelog.d/5605.bugfix b/changelog.d/5605.bugfix
deleted file mode 100644
index 4995ba9f6..000000000
--- a/changelog.d/5605.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a number of "Starting txn from sentinel context" warnings.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index a7d2008e8..5fe863197 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -35,4 +35,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.1.0rc1"
+__version__ = "1.1.0rc2"