diff --git a/app/build.gradle b/app/build.gradle
index 5db596bc..401d4ced 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,7 +51,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.appcompat:appcompat:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'com.google.android.material:material:1.6.1'
@@ -64,6 +64,6 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1'
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     implementation "androidx.activity:activity-ktx:1.5.1"
-    implementation "androidx.fragment:fragment-ktx:1.5.1"
+    implementation "androidx.fragment:fragment-ktx:1.5.2"
     implementation 'androidx.media:media:1.6.0'
 }
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index ec6b9219..70ebf7e6 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -52,13 +52,9 @@ add_library(lib_webrtc STATIC IMPORTED)
 set_target_properties(lib_webrtc PROPERTIES IMPORTED_LOCATION
         ${distribution_DIR}/webrtc/lib/${ANDROID_ABI}/libwebrtc.a)
 
-add_library(lib_bn STATIC IMPORTED)
-set_target_properties(lib_bn PROPERTIES IMPORTED_LOCATION
-        ${distribution_DIR}/bn/lib/${ANDROID_ABI}/libbn.a)
-
-add_library(lib_zrtp STATIC IMPORTED)
-set_target_properties(lib_zrtp PROPERTIES IMPORTED_LOCATION
-        ${distribution_DIR}/zrtp/lib/${ANDROID_ABI}/libzrtp.a)
+add_library(lib_zrtpcppcore STATIC IMPORTED)
+set_target_properties(lib_zrtpcppcore PROPERTIES IMPORTED_LOCATION
+        ${distribution_DIR}/gzrtp/lib/${ANDROID_ABI}/libzrtpcppcore.a)
 
 add_library(lib_baresip STATIC IMPORTED)
 set_target_properties(lib_baresip PROPERTIES IMPORTED_LOCATION
@@ -90,7 +86,6 @@ target_link_libraries(baresip
         lib_amrwb
         lib_amrwbenc
         lib_webrtc
-        lib_zrtp
-        lib_bn
+        lib_zrtpcppcore
         z
         log)
diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index f64d0731..921b35ce 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -791,7 +791,7 @@ class BaresipService: Service() {
                             call!!.security = R.drawable.locked_yellow
                         } else {
                             call!!.security = R.drawable.locked_green
-                            call.zid = ev[1]
+                            call.zid = ev[3]
                         }
                         if (!isMainVisible)
                             return
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Config.kt b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
index 92939f49..6dd1dc78 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Config.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
@@ -18,6 +18,8 @@ object Config {
 
         config = config.replace("webrtc_aec.so", "webrtc_aecm.so")
 
+        config = config.replace("module zrtp.so", "module gzrtp.so")
+
         if (config.contains("rtp_stats no"))
             replaceVariable("rtp_stats", "yes")
 
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
index df2af77e..f0ccb024 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
@@ -783,7 +783,7 @@ object Utils {
 
     fun unZip(zipFilePath: String): Boolean {
         val allFiles = listOf("accounts", "calls", "config", "contacts", "messages", "uuid",
-                "zrtp_cache.dat", "zrtp_zid", "cert.pem", "ca_cert", "ca_certs.crt")
+                "zrtp_cache.dat", "gzrtp_zid", "cert.pem", "ca_cert", "ca_certs.crt")
         val zipFiles = mutableListOf<String>()
         try {
             ZipFile(zipFilePath).use { zip ->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cbd3247a..1676a9df 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -476,7 +476,7 @@
     </string>
     <string name="registering_failed">Registering of \`%1$s\` failed.</string>
     <string name="verify">Verify Request</string>
-    <string name="verify_sas">Do you want to verify SAS &lt;%1$s&gt; &lt;%2$s&gt;?</string>
+    <string name="verify_sas">Do you want to verify SAS &lt;%1$s&gt;?</string>
     <string name="transfer_request">Transfer Request</string>
     <string name="transfer_request_query">Do you accept to transfer this call to \'%1$s\'?</string>
     <string name="call_failed">Call failed</string>