diff --git a/CHANGES.md b/CHANGES.md
index 350151b62ce8402c47291201e7ad42c58266e12c..0ffdf1aaef75a497b57d6d7aa34c1727b2cf2236 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 0.99.5.2 (2019-05-30)
+=============================
+
+Bugfixes
+--------
+
+- Fix bug where we leaked extremities when we soft failed events, leading to performance degradation. ([\#5274](https://github.com/matrix-org/synapse/issues/5274), [\#5278](https://github.com/matrix-org/synapse/issues/5278), [\#5291](https://github.com/matrix-org/synapse/issues/5291))
+
+
Synapse 0.99.5.1 (2019-05-22)
=============================
diff --git a/changelog.d/5274.bugfix b/changelog.d/5274.bugfix
deleted file mode 100644
index 9e14d20289f8778692ad42ebdfe9450de635d249..0000000000000000000000000000000000000000
--- a/changelog.d/5274.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where we leaked extremities when we soft failed events, leading to performance degradation.
diff --git a/changelog.d/5278.bugfix b/changelog.d/5278.bugfix
deleted file mode 100644
index 9e14d20289f8778692ad42ebdfe9450de635d249..0000000000000000000000000000000000000000
--- a/changelog.d/5278.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where we leaked extremities when we soft failed events, leading to performance degradation.
diff --git a/changelog.d/5291.bugfix b/changelog.d/5291.bugfix
deleted file mode 100644
index 9e14d20289f8778692ad42ebdfe9450de635d249..0000000000000000000000000000000000000000
--- a/changelog.d/5291.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug where we leaked extremities when we soft failed events, leading to performance degradation.
diff --git a/debian/changelog b/debian/changelog
index 90c6b86c5b6867073624c24f7968af91c9a27897..6a1a72c0e391d91fa48ed5bc990a81ad845b2e75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (0.99.5.2) stable; urgency=medium
+
+ * New synapse release 0.99.5.2.
+
+ -- Synapse Packaging team <packages@matrix.org> Thu, 30 May 2019 16:28:07 +0100
+
matrix-synapse-py3 (0.99.5.1) stable; urgency=medium
* New synapse release 0.99.5.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 4f95778eea27a8e64a2aeb1046cd3bb752f00ea8..d0e8d7c21ba77af397bc8f8a45bf54f5ff6532c0 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
except ImportError:
pass
-__version__ = "0.99.5.1"
+__version__ = "0.99.5.2"