diff --git a/CHANGELOG.md b/CHANGELOG.md
index 312a20ec9a..6d3eabf2b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## 8.3.6
+
+### Fixed
+
+* refactor: move to office.vue component by @backportbot in https://github.com/nextcloud/richdocuments/pull/3616
+* fix: redesign guest name picker and fix opening it for shared folders by @backportbot in https://github.com/nextcloud/richdocuments/pull/3641
+* fix: chunk loading error by @elzody in https://github.com/nextcloud/richdocuments/pull/3648
+* fix: file action to open PDFs with richdocuments when files_pdfviewer is enabled by @backportbot in https://github.com/nextcloud/richdocuments/pull/3650
+
+
+**Full Changelog**: https://github.com/nextcloud/richdocuments/compare/v8.3.5...v8.3.6
+
 ## 8.3.5
 
 ### Fixed
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 9ed3b3fef4..4368a96cad 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -6,7 +6,7 @@
 	<description><![CDATA[This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.
 
 You can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.]]></description>
-	<version>8.3.5</version>
+	<version>8.3.6</version>
 	<licence>agpl</licence>
 	<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
 	<types>
diff --git a/package-lock.json b/package-lock.json
index ecd535d007..6359459de9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "richdocuments",
-  "version": "8.3.4",
+  "version": "8.3.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index df1245f23d..82a1378d2d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "richdocuments",
   "description": "Collabora online integration",
-  "version": "8.3.5",
+  "version": "8.3.6",
   "authors": [
     {
       "name": "Julius Härtl",