diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cdd57e278d15008cb87bf118426165dea7b421f..4f2c3e99a6b0d0d4a068318895cddc98e2d6160d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 2.3.12
+* Fixed rare crash on start up
+* Fixed avatar not being refreshed in group chats
+
 ### Version 2.3.11
 * Support for Android 9 'message style' notifications
 * OMEMO stability improvements
diff --git a/build.gradle b/build.gradle
index 5aa271052bf470faad1fc8c47d70f268d53a359b..ba4a36ebf50cd0aa32252375b474a05f29ba3523 100644
--- a/build.gradle
+++ b/build.gradle
@@ -77,8 +77,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 314
-        versionName "2.3.11"
+        versionCode 317
+        versionName "2.3.12"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId