diff --git a/CHANGES.md b/CHANGES.md
index 0a0d0b3439597a28a6803d357624d64da3a2f391..78322a08c192596dc9c1d570ab65a48eaeeb8d75 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,21 @@
+Synapse 1.4.0rc2 (2019-10-02)
+=============================
+
+Bugfixes
+--------
+
+- Fix bug in background update that adds last seen information to the `devices` table, and improve its performance on Postgres. ([\#6135](https://github.com/matrix-org/synapse/issues/6135))
+- Fix bad performance of censoring redactions background task. ([\#6141](https://github.com/matrix-org/synapse/issues/6141))
+- Fix fetching censored redactions from DB, which caused APIs like initial sync to fail if it tried to include the censored redaction. ([\#6145](https://github.com/matrix-org/synapse/issues/6145))
+- Fix exceptions when storing large retry intervals for down remote servers. ([\#6146](https://github.com/matrix-org/synapse/issues/6146))
+
+
+Internal Changes
+----------------
+
+- Fix up sample config entry for `redaction_retention_period` option. ([\#6117](https://github.com/matrix-org/synapse/issues/6117))
+
+
 Synapse 1.4.0rc1 (2019-09-26)
 =============================
 
diff --git a/changelog.d/6117.misc b/changelog.d/6117.misc
deleted file mode 100644
index f8bdb58f41a008192c4b78a542d7403542f6b0ef..0000000000000000000000000000000000000000
--- a/changelog.d/6117.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix up sample config entry for `redaction_retention_period` option.
diff --git a/changelog.d/6135.bugfix b/changelog.d/6135.bugfix
deleted file mode 100644
index 5f9f010cb19e62ef36699b4b6d1a448e078ffbf8..0000000000000000000000000000000000000000
--- a/changelog.d/6135.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug in background update that adds last seen information to the `devices` table, and improve its performance on Postgres.
diff --git a/changelog.d/6141.bugfix b/changelog.d/6141.bugfix
deleted file mode 100644
index c93920b7b516c8dae4f0f415a521ae1a01b1509a..0000000000000000000000000000000000000000
--- a/changelog.d/6141.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bad performance of censoring redactions background task.
diff --git a/changelog.d/6145.bugfix b/changelog.d/6145.bugfix
deleted file mode 100644
index 9e0eb5dd4c85d5284255020ba71561d8d5985204..0000000000000000000000000000000000000000
--- a/changelog.d/6145.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix fetching censored redactions from DB, which caused APIs like initial sync to fail if it tried to include the censored redaction.
diff --git a/changelog.d/6146.bugfix b/changelog.d/6146.bugfix
deleted file mode 100644
index 1dad80183679d6acedbd50141386c69628877c64..0000000000000000000000000000000000000000
--- a/changelog.d/6146.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix exceptions when storing large retry intervals for down remote servers.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index ddfe9ec542953bcd6452a7146c84972d253d3868..5197eea22e1ce7f10533617908404dd30aea841a 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -35,4 +35,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.4.0rc1"
+__version__ = "1.4.0rc2"