diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd5c26115..009e193ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+### Version 2.8.5
+
+* Reduce echo during calls on some devices
+* Fix login when passwords contains special characters
+* Play dial and busy tones on speaker during video calls
+
 ### Version 2.8.4
 
 * Rework Login with certificate UI
diff --git a/build.gradle b/build.gradle
index 4f857c25a..702ddb0c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -77,7 +77,7 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:2.6.4"
     implementation "com.squareup.retrofit2:converter-gson:2.6.4"
     //okhttp needs to stick with 3.12.x
-    implementation 'com.squareup.okhttp3:okhttp:3.12.10'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.12'
     implementation 'com.google.guava:guava:27.1-android'
     quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.11.1'
     implementation fileTree(include: ['libwebrtc-m81.aar'], dir: 'libs')
@@ -95,8 +95,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 387
-        versionName "2.8.4"
+        versionCode 388
+        versionName "2.8.5"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/388.txt b/fastlane/metadata/android/en-US/changelogs/388.txt
new file mode 100644
index 000000000..6a4909652
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/388.txt
@@ -0,0 +1,3 @@
+* Reduce echo during calls on some devices
+* Fix login when passwords contains special characters
+* Play dial and busy tones on speaker during video calls