diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb7b437f3..1fbf8f734 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### Version 1.23.7
+* Improved MAM support + bug fixes
+
 ### Version 1.23.6
 * Fixed crash on receiving invalid HTTP slot response
 
diff --git a/build.gradle b/build.gradle
index 6bbc08487..d8b6e4cf0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,8 +68,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionCode 253
-        versionName "1.23.6"
+        versionCode 254
+        versionName "1.23.7"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
     }