diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30b868750aa..75003a26ebf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,36 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 21.1.2 – 2025-07-17
+### Changed
+- Update translations
+- Update dependencies
+
+### Fixed
+- fix(federation): Make sure some capabilities are correctly used from the remote host
+  [#15507](https://github.com/nextcloud/spreed/issues/15507)
+- fix(settings): Allow changing call notification level for federated conversations
+  [#15516](https://github.com/nextcloud/spreed/issues/15516)
+- fix(settings): Fix class name of background job checking certificates
+  [#15464](https://github.com/nextcloud/spreed/issues/15464)
+- fix(settings): Fix false-negative error being shown on certificate check if another check failed an SSL call
+  [#15525](https://github.com/nextcloud/spreed/issues/15525)
+- fix(polls): Fix deleting poll drafts
+  [#15536](https://github.com/nextcloud/spreed/issues/15536)
+
+## 20.1.9 – 2025-07-17
+### Changed
+- Update translations
+- Update dependencies
+
+### Fixed
+- fix(settings): Allow changing call notification level for federated conversations
+  [#15515](https://github.com/nextcloud/spreed/issues/15515)
+- fix(settings): Fix class name of background job checking certificates
+  [#15463](https://github.com/nextcloud/spreed/issues/15463)
+- fix(polls): Fix deleting poll drafts
+  [#15535](https://github.com/nextcloud/spreed/issues/15535)
+
 ## 21.1.1 – 2025-07-03
 ### Changed
 - Update translations
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 7cb1916220c..6c2d150c4ad 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -18,7 +18,7 @@
 * 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.
 ]]></description>
 
-	<version>21.1.1</version>
+	<version>21.1.2</version>
 	<licence>agpl</licence>
 
 	<author>Anna Larch</author>
diff --git a/package-lock.json b/package-lock.json
index 45cd9f2799a..9a124f4f6ff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "talk",
-  "version": "21.1.1",
+  "version": "21.1.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "talk",
-      "version": "21.1.1",
+      "version": "21.1.2",
       "license": "agpl",
       "dependencies": {
         "@linusborg/vue-simple-portal": "^0.1.5",
diff --git a/package.json b/package.json
index c79877762dc..ebb703f4e00 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "21.1.1",
+  "version": "21.1.2",
   "private": true,
   "description": "",
   "license": "agpl",