diff --git a/CHANGELOG b/CHANGELOG
index 84522b8..5311dca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -217,3 +217,14 @@
 * Add unread messages count to sync responses, as specified in MSC2654. (#8059, #8254, #8270, #8274)
 * Optimise /federation/v1/user/devices/ API by only returning devices with encryption keys. (#8198)
 
+[1.12.0]
+* Update Synapse to 1.21.0
+* [Full changelog](https://github.com/matrix-org/synapse/releases/tag/v1.21.0)
+* Require the user to confirm that their password should be reset after clicking the email confirmation link. (#8004)
+* Add an admin API GET /_synapse/admin/v1/event_reports to read entries of table event_reports. Contributed by @dklimpel. (#8217)
+* Consolidate the SSO error template across all configuration. (#8248, #8405)
+* Add a configuration option to specify a whitelist of domains that a user can be redirected to after validating their email or phone number. (#8275, #8417)
+* Add experimental support for sharding event persister. (#8294, #8387, #8396, #8419)
+* Add the room topic and avatar to the room details admin API. (#8305)
+* Add an admin API for querying rooms where a user is a member. Contributed by @dklimpel. (#8306)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 01114b5..c7df21e 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Secure & decentralized communication",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "healthCheckPath": "/",
   "httpPort": 8008,
   "memoryLimit": 536870912,
@@ -32,6 +32,6 @@
   "postInstallMessage": "file://POSTINSTALL.md",
   "minBoxVersion": "5.3.0",
   "forumUrl": "https://forum.cloudron.io/category/50/matrix-synapse-riot",
-  "documentationUrl": "https://cloudron.io/documentation/apps/synapse/",
+  "documentationUrl": "https://docs.cloudron.io/apps/synapse/",
   "optionalSso": true
 }
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index 5ea7a89..092c350 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages Synapse <upstream>1.20.1</upstream>.
+This app packages Synapse <upstream>1.21.0</upstream>.
 
 **This package only provides the Matrix backend. A variety of clients are available
 [here](https://matrix.org/clients/). Riot is a popular web frontend for Matrix and