diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd242198d888427b4b1dd9180bb036867aa2e396..49959e6af02a6f323b9425d5a9cadae1b28404fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.18.2
+
+* Support 'Service Outage Status'
+* Minor security fixes for parsing multiple bodies, occupant-ids and stanza-id
+
 ### Version 2.18.1
 
 * Fix reactions on files received via P2P
diff --git a/build.gradle b/build.gradle
index 9f3964e8e1a194e640b0aa6d94c5e471e92a5fde..8d32d500d9438665b739f0003c8d14d97499bfa8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -117,8 +117,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 35
-        versionCode 42140
-        versionName "2.18.1"
+        versionCode 42141
+        versionName "2.18.2"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/4214104.txt b/fastlane/metadata/android/en-US/changelogs/4214104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0c0dfcba3297a8d9a8c5e206ccb12fdf37f1ca99
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/4214104.txt
@@ -0,0 +1,2 @@
+* Support 'Service Outage Status'
+* Minor security fixes for parsing multiple bodies, occupant-ids and stanza-id