diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbf14b739..bf0934a2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Version 2.9.8
 
 * Verify A/V calls with preexisting OMEMO sessions
+* Improve compatibility with non libwebrtc WebRTC implementations
 
 ### Version 2.9.7
 
diff --git a/build.gradle b/build.gradle
index 0b909ebb0..7ab020371 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,7 +66,7 @@ dependencies {
     implementation "com.wefika:flowlayout:0.4.1"
     implementation 'net.ypresto.androidtranscoder:android-transcoder:0.3.0'
     implementation 'org.jxmpp:jxmpp-jid:0.6.4'
-    implementation 'org.osmdroid:osmdroid-android:6.1.5'
+    implementation 'org.osmdroid:osmdroid-android:6.1.10'
     implementation 'org.hsluv:hsluv:0.2'
     implementation 'org.conscrypt:conscrypt-android:2.2.1'
     implementation 'me.drakeet.support:toastcompat:1.1.0'
@@ -91,8 +91,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 42001
-        versionName "2.9.8-beta"
+        versionCode 42006
+        versionName "2.9.8"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/42006.txt b/fastlane/metadata/android/en-US/changelogs/42006.txt
new file mode 100644
index 000000000..91e2b904f
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/42006.txt
@@ -0,0 +1,2 @@
+* Verify A/V calls with preexisting OMEMO sessions
+* Improve compatibility with non libwebrtc WebRTC implementations