diff --git a/CHANGES.md b/CHANGES.md
index d6567e24d2f58dc7f0b9b79436a230b4bcc4974f..361fd1fc6c4ee9ebdc7ba766ffffc0f1ffc1fb2b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,14 @@
+Synapse 1.7.3 (2019-12-31)
+==========================
+
+This release fixes a long-standing bug in the state resolution algorithm.
+
+Bugfixes
+--------
+
+- Fix exceptions caused by state resolution choking on malformed events. ([\#6608](https://github.com/matrix-org/synapse/issues/6608))
+
+
 Synapse 1.7.2 (2019-12-20)
 ==========================
 
diff --git a/changelog.d/6608.bugfix b/changelog.d/6608.bugfix
deleted file mode 100644
index 7768e0846e7b2707f2cb977e62b433b3b19dd118..0000000000000000000000000000000000000000
--- a/changelog.d/6608.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix exceptions caused by state resolution choking on malformed events.
diff --git a/debian/changelog b/debian/changelog
index 2492b5db92b62dbff8f58c45189c162e167a0e73..31791c127c413e42b94a6ec6382264d32c3d0939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.7.3) stable; urgency=medium
+
+  * New synapse release 1.7.3.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 31 Dec 2019 10:45:04 +0000
+
 matrix-synapse-py3 (1.7.2) stable; urgency=medium
 
   * New synapse release 1.7.2.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 996101cf0985b6e4362f2b19358d55affc76fd10..71cb611820cf5ed198c0637446bbae89a1b38311 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.7.2"
+__version__ = "1.7.3"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when