diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36d2bd996f1edc13c28ce482171be26480b9091e..b5ef2e389ab0557028afff675640675948865bbc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 2.12.1
+
+* Fix crash in UnifiedPush Distributor
+
 ### Version 2.12.0
 
 * Integrate UnifiedPush Distributor to facilitate push messages to other UnifiedPush enabled apps like Tusky and Fedilab
diff --git a/build.gradle b/build.gradle
index 652f20262d421cfeff294fb6a9b8c886e61f5d2d..37c0d856f57531cac32fa8e0cedecf3d67161ff5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -91,8 +91,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 32
-        versionCode 42046
-        versionName "2.12.0"
+        versionCode 42047
+        versionName "2.12.1"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/42047.txt b/fastlane/metadata/android/en-US/changelogs/42047.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c44467f526305cc8bda306bf3934d61675817367
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/42047.txt
@@ -0,0 +1 @@
+* Fix crash in UnifiedPush Distributor