diff --git a/CHANGELOG.md b/CHANGELOG.md
index cefcc0f044..489f8c3186 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,20 @@
 -->
 # Changelog
 
+## 8.5.7
+
+### Fixed
+- Save as on mobile with direct editing by @juliusknorr in [#4741](https://github.com/nextcloud/richdocuments/pull/4741)
+- Fall back to super share if share token is not available by @blizzz in [#4738](https://github.com/nextcloud/richdocuments/pull/4738)
+- Do not fetch remote Collabora URL for own server by @elzody in [#4733](https://github.com/nextcloud/richdocuments/pull/4733)
+- Load viewer component asynchronously to reduce file size by @elzody in [#4684](https://github.com/nextcloud/richdocuments/pull/4684)
+- Use proper file id for direct editing by @juliusknorr in [#4586](https://github.com/nextcloud/richdocuments/pull/4586)
+
+### Other
+- npm audits
+- Dependency updates
+- Improve tests and CI workflows
+
 ## 8.5.6
 
 ### Added
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 9279a53ee8..28638d8050 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -11,7 +11,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.5.6</version>
+	<version>8.5.7</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 17d2dacc47..a15da1328c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "richdocuments",
-  "version": "8.5.6",
+  "version": "8.5.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "richdocuments",
-      "version": "8.5.6",
+      "version": "8.5.7",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@nextcloud/auth": "^2.4.0",
diff --git a/package.json b/package.json
index 5e30568f30..143a91c142 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "richdocuments",
   "description": "Collabora online integration",
-  "version": "8.5.6",
+  "version": "8.5.7",
   "authors": [
     {
       "name": "Julius Härtl",