diff --git a/CHANGELOG.md b/CHANGELOG.md
index a18b76ef7..feb93e336 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,22 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 3.6.0 – unreleased
+### Added
+* Selection of untrusted S/MIME certificates
+* Suggested replies
+* LLM suggested event titles and agendas
+* Maximize composer modal
+* Descriptions for events created from threads
+### Changed
+* Move threads with drag and drop
+* One feature setting for all LLM features
+* Faster background sync
+### Fixed
+* Database index usages
+* Division by zero
+* Autoconfig via MX DNS records
+
 ## 3.5.0 – unreleased
 ### Added
 - Emoji picker via : symbol
diff --git a/appinfo/info.xml b/appinfo/info.xml
index db765bfbb..94ad5778f 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -29,7 +29,7 @@ The rating depends on the installed text processing backend. See [the rating ove
 
 Learn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).
 	]]></description>
-	<version>3.6.0-alpha.4</version>
+	<version>3.6.0-beta.1</version>
 	<licence>agpl</licence>
 	<author>Christoph Wurst</author>
 	<author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author>
diff --git a/package-lock.json b/package-lock.json
index 2f8fd8d90..144c95ecf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "nextcloud-mail",
-  "version": "3.6.0-alpha4",
+  "version": "3.6.0-beta1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "nextcloud-mail",
-      "version": "3.6.0-alpha4",
+      "version": "3.6.0-beta1",
       "license": "agpl",
       "dependencies": {
         "@ckeditor/ckeditor5-alignment": "37.1.0",
diff --git a/package.json b/package.json
index 87e82872f..f175171d5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nextcloud-mail",
   "description": "Nextcloud Mail",
-  "version": "3.6.0-alpha4",
+  "version": "3.6.0-beta1",
   "author": "Christoph Wurst <christoph@winzerhof-wurst.at>",
   "license": "agpl",
   "private": true,