diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b2bb7c5bf1159b7794ef43c378e245e2629c5bf..401f577923421f8867c331feea0a2ce75b45efbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.17.2
+
+* Fix calls on Android 15
+* Fix rare crash / regression introduced with 2.17.0
+
 ### Version 2.17.1
 
 * Fix UI glitch when showing multiple reactions
diff --git a/build.gradle b/build.gradle
index 7be25ad8a4d320517951b7d74aac5289ff3c7dbb..ec4fe938d40a10eff046f2b17b868049efe3efa1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,8 +100,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 42122
-        versionName "2.17.1"
+        versionCode 42123
+        versionName "2.17.2"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/4212304.txt b/fastlane/metadata/android/en-US/changelogs/4212304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..800d1fb03c4fdb8f7256b2e534f1021f9d45b7cd
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/4212304.txt
@@ -0,0 +1,2 @@
+* Fix calls on Android 15
+* Fix rare crash / regression introduced with 2.17.0