diff --git a/CHANGELOG.md b/CHANGELOG.md
index 244d3bfe69a31b88e3625a8a82b0b06aa9b9f4ff..101da24277be1351fcef481e2529fca1ed3f7cc6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+### Version 2.0.0
+* OMEMO by default for everything but public group chats
+* Integrate QR code scanner (requires camera permission)
+* Removed support for OTR
+* Removed support for customizable resources
+* Removed slide out panel for conversation overview
+* Add ability to change status message
+* Highlight irregular unicode code blocks in Jabber IDs
+
 ### Version 1.23.8
 * bug fixes
 
diff --git a/build.gradle b/build.gradle
index b9b31a9c019e9d22b317eceffbc553e67aefe9ab..377a37bbb078c43f37f1eb0e04c0ca002cbc1fd8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,8 +68,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 255
-        versionName "1.23.8"
+        versionCode 256
+        versionName "2.0.0-beta"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId