diff --git a/CHANGES.rst b/CHANGES.rst
index ba6929c435111ceffdd7348262f4f61788245e84..afc4fee882778044b51932b890b95da07be8762b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,31 @@
+Synapse 0.33.0 (2018-07-19)
+===========================
+
+Features
+--------
+
+- Enforce the specified API for report_event (`#3316 <https://github.com/matrix-org/synapse/issues/3316>`_)
+- Include CPU time from database threads in request/block metrics. (`#3496 <https://github.com/matrix-org/synapse/issues/3496>`_, `#3501 <https://github.com/matrix-org/synapse/issues/3501>`_)
+- Add CPU metrics for _fetch_event_list (`#3497 <https://github.com/matrix-org/synapse/issues/3497>`_)
+- optimisation for /sync (`#3505 <https://github.com/matrix-org/synapse/issues/3505>`_, `#3521 <https://github.com/matrix-org/synapse/issues/3521>`_)
+- Optimisation to make handling incoming federation requests more efficient. (`#3541 <https://github.com/matrix-org/synapse/issues/3541>`_)
+
+
+Bugfixes
+--------
+
+- Use more portable syntax in our use of the attrs package, widening the supported versions (`#3498 <https://github.com/matrix-org/synapse/issues/3498>`_)
+- Fix queued federation requests being processed in the wrong order (`#3533 <https://github.com/matrix-org/synapse/issues/3533>`_)
+- Ensure that erasure requests are correctly honoured for publicly accessible rooms when accessed over federation. (`#3546 <https://github.com/matrix-org/synapse/issues/3546>`_)
+- Disable a noisy warning about logcontexts (`#3561 <https://github.com/matrix-org/synapse/issues/3561>`_)
+
+
+Misc
+----
+
+- `#3351 <https://github.com/matrix-org/synapse/issues/3351>`_, `#3463 <https://github.com/matrix-org/synapse/issues/3463>`_, `#3464 <https://github.com/matrix-org/synapse/issues/3464>`_, `#3499 <https://github.com/matrix-org/synapse/issues/3499>`_, `#3530 <https://github.com/matrix-org/synapse/issues/3530>`_, `#3534 <https://github.com/matrix-org/synapse/issues/3534>`_, `#3535 <https://github.com/matrix-org/synapse/issues/3535>`_, `#3540 <https://github.com/matrix-org/synapse/issues/3540>`_, `#3544 <https://github.com/matrix-org/synapse/issues/3544>`_
+
+
 Synapse 0.32.2 (2018-07-07)
 ===========================
 
diff --git a/changelog.d/3316.feature b/changelog.d/3316.feature
deleted file mode 100644
index 50068b72224c42433b9b8ebd67595be10ee98f92..0000000000000000000000000000000000000000
--- a/changelog.d/3316.feature
+++ /dev/null
@@ -1 +0,0 @@
-Enforce the specified API for report_event
diff --git a/changelog.d/3351.misc b/changelog.d/3351.misc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/changelog.d/3463.misc b/changelog.d/3463.misc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/changelog.d/3464.misc b/changelog.d/3464.misc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/changelog.d/3496.feature b/changelog.d/3496.feature
deleted file mode 100644
index 6a06a7e75560da27d44f3c48be15c9515d378ef2..0000000000000000000000000000000000000000
--- a/changelog.d/3496.feature
+++ /dev/null
@@ -1 +0,0 @@
-Include CPU time from database threads in request/block metrics.
diff --git a/changelog.d/3497.feature b/changelog.d/3497.feature
deleted file mode 100644
index 4e333155b66bf1b50be6a837cec7d9bf9b7f23bd..0000000000000000000000000000000000000000
--- a/changelog.d/3497.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add CPU metrics for _fetch_event_list
diff --git a/changelog.d/3498.bugfix b/changelog.d/3498.bugfix
deleted file mode 100644
index d0d01101f30ce2a36f27821c95f0a8f14dab1dde..0000000000000000000000000000000000000000
--- a/changelog.d/3498.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Use more portable syntax in our use of the attrs package, widening the supported versions
diff --git a/changelog.d/3499.misc b/changelog.d/3499.misc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/changelog.d/3501.feature b/changelog.d/3501.feature
deleted file mode 100644
index 6a06a7e75560da27d44f3c48be15c9515d378ef2..0000000000000000000000000000000000000000
--- a/changelog.d/3501.feature
+++ /dev/null
@@ -1 +0,0 @@
-Include CPU time from database threads in request/block metrics.
diff --git a/changelog.d/3505.feature b/changelog.d/3505.feature
deleted file mode 100644
index a6b686f68decaa352e7584d1c3607a093f35c40c..0000000000000000000000000000000000000000
--- a/changelog.d/3505.feature
+++ /dev/null
@@ -1 +0,0 @@
-optimisation for /sync
diff --git a/changelog.d/3521.feature b/changelog.d/3521.feature
deleted file mode 100644
index a6b686f68decaa352e7584d1c3607a093f35c40c..0000000000000000000000000000000000000000
--- a/changelog.d/3521.feature
+++ /dev/null
@@ -1 +0,0 @@
-optimisation for /sync
diff --git a/changelog.d/3530.misc b/changelog.d/3530.misc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/changelog.d/3533.bugfix b/changelog.d/3533.bugfix
deleted file mode 100644
index 04cbbefd5fd2d4f233f66820a0bf87562c8b2210..0000000000000000000000000000000000000000
--- a/changelog.d/3533.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix queued federation requests being processed in the wrong order
diff --git a/changelog.d/3534.misc b/changelog.d/3534.misc
deleted file mode 100644
index 949c12dc6927092d9baebc232790b4ed4b954b55..0000000000000000000000000000000000000000
--- a/changelog.d/3534.misc
+++ /dev/null
@@ -1 +0,0 @@
-refactor: use parse_{string,integer} and assert's from http.servlet for deduplication
diff --git a/changelog.d/3535.misc b/changelog.d/3535.misc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/changelog.d/3540.misc b/changelog.d/3540.misc
deleted file mode 100644
index 99dcad8e46eb0f1467e858c4bc07bde485472786..0000000000000000000000000000000000000000
--- a/changelog.d/3540.misc
+++ /dev/null
@@ -1 +0,0 @@
-check isort for each PR
diff --git a/changelog.d/3541.feature b/changelog.d/3541.feature
deleted file mode 100644
index 24524136eac96680f17502ecedac50443faf2d98..0000000000000000000000000000000000000000
--- a/changelog.d/3541.feature
+++ /dev/null
@@ -1 +0,0 @@
-Optimisation to make handling incoming federation requests more efficient.
\ No newline at end of file
diff --git a/changelog.d/3544.misc b/changelog.d/3544.misc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/changelog.d/3546.bugfix b/changelog.d/3546.bugfix
deleted file mode 100644
index 921dc6e7b084aeca9284cbc25a00827a1559c0db..0000000000000000000000000000000000000000
--- a/changelog.d/3546.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure that erasure requests are correctly honoured for publicly accessible rooms when accessed over federation.
\ No newline at end of file
diff --git a/changelog.d/3561.bugfix b/changelog.d/3561.bugfix
deleted file mode 100644
index 9a197cd67f509ce09ca4e148b52fd6d38c2bc096..0000000000000000000000000000000000000000
--- a/changelog.d/3561.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Disable a noisy warning about logcontexts