diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca90749ba..21b56f3d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.11.1
+
+* Fix resend loop on servers that support only sm:2
+* Show 'Switch to video' only if other party supports video
+
 ### Version 2.11.0
 
 * Implement Extensible SASL Profile, Bind 2.0 and Fast for faster reconnects
diff --git a/build.gradle b/build.gradle
index fa4a0aca0..bb0befe00 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ configurations {
 dependencies {
     implementation 'androidx.viewpager:viewpager:1.0.0'
 
-    playstoreImplementation('com.google.firebase:firebase-messaging:23.1.0') {
+    playstoreImplementation('com.google.firebase:firebase-messaging:23.1.1') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
@@ -94,14 +94,14 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 32
-        versionCode 42041
-        versionName "2.11.0"
+        versionCode 42042
+        versionName "2.11.1"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
         def appName = "Conversations"
         resValue "string", "app_name", appName
-        buildConfigField "String", "APP_NAME", "\"$appName\"";
+        buildConfigField "String", "APP_NAME", "\"$appName\""
     }
 
     splits {
@@ -135,7 +135,7 @@ android {
 
             def appName = "Quicksy"
             resValue "string", "app_name", appName
-            buildConfigField "String", "APP_NAME", "\"$appName\"";
+            buildConfigField "String", "APP_NAME", "\"$appName\""
         }
 
         conversations {