diff --git a/CHANGES.md b/CHANGES.md
index 8302610585c9..1c3d575c3747 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,64 @@
+Synapse 0.33.9 (2018-11-19)
+===========================
+
+No significant changes.
+
+
+Synapse 0.33.9rc1 (2018-11-14)
+==============================
+
+Features
+--------
+
+- Include flags to optionally add `m.login.terms` to the registration flow when consent tracking is enabled. ([\#4004](https://github.com/matrix-org/synapse/issues/4004), [\#4133](https://github.com/matrix-org/synapse/issues/4133), [\#4142](https://github.com/matrix-org/synapse/issues/4142), [\#4184](https://github.com/matrix-org/synapse/issues/4184))
+- Support for replacing rooms with new ones ([\#4091](https://github.com/matrix-org/synapse/issues/4091), [\#4099](https://github.com/matrix-org/synapse/issues/4099), [\#4100](https://github.com/matrix-org/synapse/issues/4100), [\#4101](https://github.com/matrix-org/synapse/issues/4101))
+
+
+Bugfixes
+--------
+
+- Fix exceptions when using the email mailer on Python 3. ([\#4095](https://github.com/matrix-org/synapse/issues/4095))
+- Fix e2e key backup with more than 9 backup versions ([\#4113](https://github.com/matrix-org/synapse/issues/4113))
+- Searches that request profile info now no longer fail with a 500. ([\#4122](https://github.com/matrix-org/synapse/issues/4122))
+- fix return code of empty key backups ([\#4123](https://github.com/matrix-org/synapse/issues/4123))
+- If the typing stream ID goes backwards (as on a worker when the master restarts), the worker's typing handler will no longer erroneously report rooms containing new typing events. ([\#4127](https://github.com/matrix-org/synapse/issues/4127))
+- Fix table lock of device_lists_remote_cache which could freeze the application ([\#4132](https://github.com/matrix-org/synapse/issues/4132))
+- Fix exception when using state res v2 algorithm ([\#4135](https://github.com/matrix-org/synapse/issues/4135))
+- Generating the user consent URI no longer fails on Python 3. ([\#4140](https://github.com/matrix-org/synapse/issues/4140), [\#4163](https://github.com/matrix-org/synapse/issues/4163))
+- Loading URL previews from the DB cache on Postgres will no longer cause Unicode type errors when responding to the request, and URL previews will no longer fail if the remote server returns a Content-Type header with the chartype in quotes. ([\#4157](https://github.com/matrix-org/synapse/issues/4157))
+- The hash_password script now works on Python 3. ([\#4161](https://github.com/matrix-org/synapse/issues/4161))
+- Fix noop checks when updating device keys, reducing spurious device list update notifications. ([\#4164](https://github.com/matrix-org/synapse/issues/4164))
+
+
+Deprecations and Removals
+-------------------------
+
+- The disused and un-specced identicon generator has been removed. ([\#4106](https://github.com/matrix-org/synapse/issues/4106))
+- The obsolete and non-functional /pull federation endpoint has been removed. ([\#4118](https://github.com/matrix-org/synapse/issues/4118))
+- The deprecated v1 key exchange endpoints have been removed. ([\#4119](https://github.com/matrix-org/synapse/issues/4119))
+- Synapse will no longer fetch keys using the fallback deprecated v1 key exchange method and will now always use v2. ([\#4120](https://github.com/matrix-org/synapse/issues/4120))
+
+
+Internal Changes
+----------------
+
+- Fix build of Docker image with docker-compose ([\#3778](https://github.com/matrix-org/synapse/issues/3778))
+- Delete unreferenced state groups during history purge ([\#4006](https://github.com/matrix-org/synapse/issues/4006))
+- The "Received rdata" log messages on workers is now logged at DEBUG, not INFO. ([\#4108](https://github.com/matrix-org/synapse/issues/4108))
+- Reduce replication traffic for device lists ([\#4109](https://github.com/matrix-org/synapse/issues/4109))
+- Fix `synapse_replication_tcp_protocol_*_commands` metric label to be full command name, rather than just the first character ([\#4110](https://github.com/matrix-org/synapse/issues/4110))
+- Log some bits about room creation ([\#4121](https://github.com/matrix-org/synapse/issues/4121))
+- Fix `tox` failure on old systems ([\#4124](https://github.com/matrix-org/synapse/issues/4124))
+- Add STATE_V2_TEST room version ([\#4128](https://github.com/matrix-org/synapse/issues/4128))
+- Clean up event accesses and tests ([\#4137](https://github.com/matrix-org/synapse/issues/4137))
+- The default logging config will now set an explicit log file encoding of UTF-8. ([\#4138](https://github.com/matrix-org/synapse/issues/4138))
+- Add helpers functions for getting prev and auth events of an event ([\#4139](https://github.com/matrix-org/synapse/issues/4139))
+- Add some tests for the HTTP pusher. ([\#4149](https://github.com/matrix-org/synapse/issues/4149))
+- add purge_history.sh and purge_remote_media.sh scripts to contrib/ ([\#4155](https://github.com/matrix-org/synapse/issues/4155))
+- HTTP tests have been refactored to contain less boilerplate. ([\#4156](https://github.com/matrix-org/synapse/issues/4156))
+- Drop incoming events from federation for unknown rooms ([\#4165](https://github.com/matrix-org/synapse/issues/4165))
+
+
 Synapse 0.33.8 (2018-11-01)
 ===========================
 
diff --git a/changelog.d/3778.misc b/changelog.d/3778.misc
deleted file mode 100644
index b78a2c9f42b3..000000000000
--- a/changelog.d/3778.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix build of Docker image with docker-compose
diff --git a/changelog.d/4004.feature b/changelog.d/4004.feature
deleted file mode 100644
index 89975f4c6e56..000000000000
--- a/changelog.d/4004.feature
+++ /dev/null
@@ -1 +0,0 @@
-Include flags to optionally add `m.login.terms` to the registration flow when consent tracking is enabled.
diff --git a/changelog.d/4006.misc b/changelog.d/4006.misc
deleted file mode 100644
index 35ffa1c2d295..000000000000
--- a/changelog.d/4006.misc
+++ /dev/null
@@ -1 +0,0 @@
-Delete unreferenced state groups during history purge
diff --git a/changelog.d/4091.feature b/changelog.d/4091.feature
deleted file mode 100644
index a3f7dbdcdd7e..000000000000
--- a/changelog.d/4091.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support for replacing rooms with new ones
diff --git a/changelog.d/4095.bugfix b/changelog.d/4095.bugfix
deleted file mode 100644
index 76ee7148c272..000000000000
--- a/changelog.d/4095.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix exceptions when using the email mailer on Python 3.
diff --git a/changelog.d/4099.feature b/changelog.d/4099.feature
deleted file mode 100644
index a3f7dbdcdd7e..000000000000
--- a/changelog.d/4099.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support for replacing rooms with new ones
diff --git a/changelog.d/4100.feature b/changelog.d/4100.feature
deleted file mode 100644
index a3f7dbdcdd7e..000000000000
--- a/changelog.d/4100.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support for replacing rooms with new ones
diff --git a/changelog.d/4101.feature b/changelog.d/4101.feature
deleted file mode 100644
index a3f7dbdcdd7e..000000000000
--- a/changelog.d/4101.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support for replacing rooms with new ones
diff --git a/changelog.d/4106.removal b/changelog.d/4106.removal
deleted file mode 100644
index 7e63208daa50..000000000000
--- a/changelog.d/4106.removal
+++ /dev/null
@@ -1 +0,0 @@
-The disused and un-specced identicon generator has been removed.
diff --git a/changelog.d/4108.misc b/changelog.d/4108.misc
deleted file mode 100644
index 85810c3d8365..000000000000
--- a/changelog.d/4108.misc
+++ /dev/null
@@ -1 +0,0 @@
-The "Received rdata" log messages on workers is now logged at DEBUG, not INFO.
diff --git a/changelog.d/4109.misc b/changelog.d/4109.misc
deleted file mode 100644
index 566c68311931..000000000000
--- a/changelog.d/4109.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce replication traffic for device lists
diff --git a/changelog.d/4110.misc b/changelog.d/4110.misc
deleted file mode 100644
index a50327ae34d2..000000000000
--- a/changelog.d/4110.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix `synapse_replication_tcp_protocol_*_commands` metric label to be full command name, rather than just the first character
diff --git a/changelog.d/4113.bugfix b/changelog.d/4113.bugfix
deleted file mode 100644
index 7f9d8ee0326a..000000000000
--- a/changelog.d/4113.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix e2e key backup with more than 9 backup versions
diff --git a/changelog.d/4118.removal b/changelog.d/4118.removal
deleted file mode 100644
index 6fb1d67b475b..000000000000
--- a/changelog.d/4118.removal
+++ /dev/null
@@ -1 +0,0 @@
-The obsolete and non-functional /pull federation endpoint has been removed.
diff --git a/changelog.d/4119.removal b/changelog.d/4119.removal
deleted file mode 100644
index 81383ece6b66..000000000000
--- a/changelog.d/4119.removal
+++ /dev/null
@@ -1 +0,0 @@
-The deprecated v1 key exchange endpoints have been removed.
diff --git a/changelog.d/4120.removal b/changelog.d/4120.removal
deleted file mode 100644
index a7a567098f8d..000000000000
--- a/changelog.d/4120.removal
+++ /dev/null
@@ -1 +0,0 @@
-Synapse will no longer fetch keys using the fallback deprecated v1 key exchange method and will now always use v2.
diff --git a/changelog.d/4121.misc b/changelog.d/4121.misc
deleted file mode 100644
index 9c29d80c3ffe..000000000000
--- a/changelog.d/4121.misc
+++ /dev/null
@@ -1 +0,0 @@
-Log some bits about room creation
diff --git a/changelog.d/4122.bugfix b/changelog.d/4122.bugfix
deleted file mode 100644
index 66dcfb18b957..000000000000
--- a/changelog.d/4122.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Searches that request profile info now no longer fail with a 500.
diff --git a/changelog.d/4123.bugfix b/changelog.d/4123.bugfix
deleted file mode 100644
index b82bc2aad34b..000000000000
--- a/changelog.d/4123.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-fix return code of empty key backups
diff --git a/changelog.d/4124.misc b/changelog.d/4124.misc
deleted file mode 100644
index 28f438b9b2ca..000000000000
--- a/changelog.d/4124.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix `tox` failure on old systems
diff --git a/changelog.d/4127.bugfix b/changelog.d/4127.bugfix
deleted file mode 100644
index 0701d2ceaac2..000000000000
--- a/changelog.d/4127.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-If the typing stream ID goes backwards (as on a worker when the master restarts), the worker's typing handler will no longer erroneously report rooms containing new typing events.
diff --git a/changelog.d/4128.misc b/changelog.d/4128.misc
deleted file mode 100644
index 76ab4b085c91..000000000000
--- a/changelog.d/4128.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add STATE_V2_TEST room version
diff --git a/changelog.d/4132.bugfix b/changelog.d/4132.bugfix
deleted file mode 100644
index 2304a40f0573..000000000000
--- a/changelog.d/4132.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix table lock of device_lists_remote_cache which could freeze the application
\ No newline at end of file
diff --git a/changelog.d/4133.feature b/changelog.d/4133.feature
deleted file mode 100644
index 89975f4c6e56..000000000000
--- a/changelog.d/4133.feature
+++ /dev/null
@@ -1 +0,0 @@
-Include flags to optionally add `m.login.terms` to the registration flow when consent tracking is enabled.
diff --git a/changelog.d/4135.bugfix b/changelog.d/4135.bugfix
deleted file mode 100644
index 6879b1c1620a..000000000000
--- a/changelog.d/4135.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix exception when using state res v2 algorithm
diff --git a/changelog.d/4137.misc b/changelog.d/4137.misc
deleted file mode 100644
index 4fe933e33cba..000000000000
--- a/changelog.d/4137.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up event accesses and tests
diff --git a/changelog.d/4138.misc b/changelog.d/4138.misc
deleted file mode 100644
index 300199f8e8b2..000000000000
--- a/changelog.d/4138.misc
+++ /dev/null
@@ -1 +0,0 @@
-The default logging config will now set an explicit log file encoding of UTF-8.
diff --git a/changelog.d/4139.misc b/changelog.d/4139.misc
deleted file mode 100644
index d63d9e70038b..000000000000
--- a/changelog.d/4139.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add helpers functions for getting prev and auth events of an event
diff --git a/changelog.d/4140.bugfix b/changelog.d/4140.bugfix
deleted file mode 100644
index c7e0ee229dc3..000000000000
--- a/changelog.d/4140.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Generating the user consent URI no longer fails on Python 3.
diff --git a/changelog.d/4142.feature b/changelog.d/4142.feature
deleted file mode 100644
index 89975f4c6e56..000000000000
--- a/changelog.d/4142.feature
+++ /dev/null
@@ -1 +0,0 @@
-Include flags to optionally add `m.login.terms` to the registration flow when consent tracking is enabled.
diff --git a/changelog.d/4149.misc b/changelog.d/4149.misc
deleted file mode 100644
index 0b299f0c6e7b..000000000000
--- a/changelog.d/4149.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add some tests for the HTTP pusher.
diff --git a/changelog.d/4155.misc b/changelog.d/4155.misc
deleted file mode 100644
index 4a7d5acb66e0..000000000000
--- a/changelog.d/4155.misc
+++ /dev/null
@@ -1 +0,0 @@
-add purge_history.sh and purge_remote_media.sh scripts to contrib/
diff --git a/changelog.d/4156.misc b/changelog.d/4156.misc
deleted file mode 100644
index 20d404406c1b..000000000000
--- a/changelog.d/4156.misc
+++ /dev/null
@@ -1 +0,0 @@
-HTTP tests have been refactored to contain less boilerplate.
diff --git a/changelog.d/4157.bugfix b/changelog.d/4157.bugfix
deleted file mode 100644
index 265514c3af09..000000000000
--- a/changelog.d/4157.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Loading URL previews from the DB cache on Postgres will no longer cause Unicode type errors when responding to the request, and URL previews will no longer fail if the remote server returns a Content-Type header with the chartype in quotes.
\ No newline at end of file
diff --git a/changelog.d/4161.bugfix b/changelog.d/4161.bugfix
deleted file mode 100644
index 252a40376bcf..000000000000
--- a/changelog.d/4161.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-The hash_password script now works on Python 3.
diff --git a/changelog.d/4163.bugfix b/changelog.d/4163.bugfix
deleted file mode 100644
index c7e0ee229dc3..000000000000
--- a/changelog.d/4163.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Generating the user consent URI no longer fails on Python 3.
diff --git a/changelog.d/4164.bugfix b/changelog.d/4164.bugfix
deleted file mode 100644
index f70e0b2056d6..000000000000
--- a/changelog.d/4164.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix noop checks when updating device keys, reducing spurious device list update notifications.
diff --git a/changelog.d/4165.misc b/changelog.d/4165.misc
deleted file mode 100644
index 415d80aeab08..000000000000
--- a/changelog.d/4165.misc
+++ /dev/null
@@ -1 +0,0 @@
-Drop incoming events from federation for unknown rooms
diff --git a/changelog.d/4184.feature b/changelog.d/4184.feature
deleted file mode 100644
index 89975f4c6e56..000000000000
--- a/changelog.d/4184.feature
+++ /dev/null
@@ -1 +0,0 @@
-Include flags to optionally add `m.login.terms` to the registration flow when consent tracking is enabled.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 89ea9a97753b..5a28fe2b82e1 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@
 except ImportError:
     pass
 
-__version__ = "0.33.8"
+__version__ = "0.33.9"