diff --git a/CHANGELOG.md b/CHANGELOG.md
index 141b96ed2..7a5c2e7b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,19 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 1.12.6
+
+### Fixed
+
+- Fix: incorrect height of editing windows and edit bar #6418
+- Avoid sql error on ONLY_FULL_GROUP_BY #6391
+
+### Maintenance
+
+- Fix npm audit #6374
+- Update nextcloud/ocp dependency #6385
+- Update nextcloud/ocp dependency #6350
+
 ## 1.12.5
 
 ### Fixed
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 429cb6185..2e13a809f 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -16,7 +16,7 @@
 - 🚀 Get your project organized
 
 </description>
-    <version>1.12.5</version>
+    <version>1.12.6</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <documentation>
diff --git a/package-lock.json b/package-lock.json
index 64477dbb3..6ff0cb513 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "deck",
-  "version": "1.12.5",
+  "version": "1.12.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "deck",
-      "version": "1.12.5",
+      "version": "1.12.6",
       "license": "agpl",
       "dependencies": {
         "@babel/polyfill": "^7.12.1",
diff --git a/package.json b/package.json
index 6adea9db0..da3923ca5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "deck",
   "description": "",
-  "version": "1.12.5",
+  "version": "1.12.6",
   "authors": [
     {
       "name": "Julius Härtl",