diff --git a/CHANGELOG.md b/CHANGELOG.md
index e80aa080e..f0164ff41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.3.5
+* Fixed group chat mentions when nick ends in . (dot)
+* Fixed Conversations not asking for permissions after direct share
+* Fixed CVE-2018-18467
+
 ### Version 2.3.4
 * Fixed sending OMEMO files to ChatSecure
 
diff --git a/build.gradle b/build.gradle
index 4fa1bce9c..362e17ca8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -70,8 +70,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 296
-        versionName "2.3.4"
+        versionCode 297
+        versionName "2.3.5"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId