diff --git a/CHANGES.md b/CHANGES.md
index aeec4fa5fa57018563c1ac51eb03f199e63234a8..0f9798a4d3b712e805bcd84c4eeef15d04391e35 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 1.36.0 (2021-06-15)
+===========================
+
+No significant changes.
+
+
 Synapse 1.36.0rc2 (2021-06-11)
 ==============================
 
diff --git a/debian/changelog b/debian/changelog
index 084e878def4f12956a625f07a5eac5818167165e..e640dadde9e046a0fde8e10c17f9a67cbab1ebb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.36.0) stable; urgency=medium
+
+  * New synapse release 1.36.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 15 Jun 2021 15:41:53 +0100
+
 matrix-synapse-py3 (1.35.1) stable; urgency=medium
 
   * New synapse release 1.35.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 407ba14a761e5edfc5a5ff51985c884c9386227b..c3016fc6ed8272f950d03784ed0dace4ec3d6655 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.36.0rc2"
+__version__ = "1.36.0"
 
 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