diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0164ff41..b068f76af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 2.3.6
+* Improved handling of bookmark nicks
+* Show send PM menu entry in anonymous MUCs
+
 ### Version 2.3.5
 * Fixed group chat mentions when nick ends in . (dot)
 * Fixed Conversations not asking for permissions after direct share
diff --git a/build.gradle b/build.gradle
index fdafb3342..dd066ad46 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,9 +73,9 @@ android {
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 25
-        versionCode 297
-        versionName "2.3.5"
+        targetSdkVersion 28
+        versionCode 299
+        versionName "2.3.6"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
@@ -206,7 +206,7 @@ android {
     }
 
     lintOptions {
-        disable 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource'
+        disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource'
     }
 
     subprojects {