diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfe2d86ca59a6694d9ef703bee54ac703e17a2f2..fd5c26115a9a5721fb22e51fe5fcfc426670d369 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ### Version 2.8.4
 
 * Rework Login with certificate UI
-* bug fixes
+* Add ability to pin chats on top (add to favorites)
 
 ### Version 2.8.3
 
diff --git a/build.gradle b/build.gradle
index a1a0433e7ef84a9f88e23f6c3f62598159fcc8e0..806f1d0afa7f5e61d04222f76702c2b1dcc792d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -95,8 +95,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 384
-        versionName "2.8.4-beta"
+        versionCode 385
+        versionName "2.8.4"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/385.txt b/fastlane/metadata/android/en-US/changelogs/385.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2710be0a51d34ff4590979d4280c1689d1cf6a06
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/385.txt
@@ -0,0 +1,2 @@
+* Rework Login with certificate UI
+* Add ability to pin chats on top (add to favorites)