diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f2c3e99a..671f3d4dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### Version 2.4.0
+* New Backup / Restore feature
+* Clearly distinguish between (private) group chats and (public) channels
+* Redesigned participants view for group chats and channels
+* Redesigned create new contact/group chat/channel flow in Start Conversation screen
+
+
 ### Version 2.3.12
 * Fixed rare crash on start up
 * Fixed avatar not being refreshed in group chats
diff --git a/build.gradle b/build.gradle
index 19efaad00..fdf8ab755 100644
--- a/build.gradle
+++ b/build.gradle
@@ -78,8 +78,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 317
-        versionName "2.3.12"
+        versionCode 318
+        versionName "2.4.0-beta"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId