diff --git a/CHANGELOG.md b/CHANGELOG.md
index 235d70b068..fdea2f28d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,23 @@
 -->
 # Changelog
 
+## 8.7.0
+
+### Added
+
+- feat: Add option to set secure view for public talk shares [#4808](https://github.com/nextcloud/richdocuments/pull/4808)
+
+### Fixed
+
+- fix: Ensure edit permissions are checked before template file token generation [#4797](https://github.com/nextcloud/richdocuments/pull/4797)
+- fix(CoolFrame): Init and accept postMessage for setting iframe height [#4796](https://github.com/nextcloud/richdocuments/pull/4796)
+- fix: check if template fields should be extracted [#4810](https://github.com/nextcloud/richdocuments/pull/4810)
+
+### Other
+
+- Revert "test: use nightly collabora build for now" [#4790](https://github.com/nextcloud/richdocuments/pull/4790)
+- chore(test): add unit tests for RegisterTemplateFileCreatorListener [#4821](https://github.com/nextcloud/richdocuments/pull/4821)
+
 ## 8.6.5
 
 ### Fixed
diff --git a/appinfo/info.xml b/appinfo/info.xml
index be67e07f16..67a3232acb 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -11,11 +11,11 @@
 	<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.6.5</version>
+	<version>8.7.0</version>
 	<licence>agpl</licence>
 	<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
 	<types>
-		<filesystem />
+		<filesystem/>
 		<prevent_group_restriction/>
 	</types>
 	<documentation>
diff --git a/package.json b/package.json
index 88271fa74d..9d602b06d7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "richdocuments",
   "description": "Collabora online integration",
-  "version": "8.6.5",
+  "version": "8.7.0",
   "authors": [
     {
       "name": "Julius Härtl",
@@ -86,4 +86,4 @@
     ],
     "globalSetup": "<rootDir>/src/tests/setup.js"
   }
-}
+}
\ No newline at end of file