From 7acf7f2f8df9726c961b392f21ee7a92d062fb39 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 7 Jun 2023 10:51:17 +0100
Subject: [PATCH] 1.85.1

---
 CHANGES.md               | 9 +++++++++
 changelog.d/15738.bugfix | 1 -
 debian/changelog         | 6 ++++++
 pyproject.toml           | 2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/15738.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index ea13b554ba..81bf3cc110 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.85.1 (2023-06-07)
+===========================
+
+Bugfixes
+--------
+
+- Fix bug in schema delta that broke upgrades for some deployments. Introduced in v1.85.0. ([\#15738](https://github.com/matrix-org/synapse/issues/15738))
+
+
 Synapse 1.85.0 (2023-06-06)
 ===========================
 
diff --git a/changelog.d/15738.bugfix b/changelog.d/15738.bugfix
deleted file mode 100644
index 7129ab0782..0000000000
--- a/changelog.d/15738.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug in schema delta that broke upgrades for some deployments. Introduced in v1.85.0.
diff --git a/debian/changelog b/debian/changelog
index 2278a83283..6d6f10ddf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.85.1) stable; urgency=medium
+
+  * New Synapse release 1.85.1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 07 Jun 2023 10:51:12 +0100
+
 matrix-synapse-py3 (1.85.0) stable; urgency=medium
 
   * New Synapse release 1.85.0.
diff --git a/pyproject.toml b/pyproject.toml
index 745b58d7b5..5b6123dff6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -89,7 +89,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.85.0"
+version = "1.85.1"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"