diff --git a/jni/Application.mk b/jni/Application.mk
index 4e3da3ff4..cae48dba9 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -94,7 +94,7 @@ APP_MODULES += libtunnelclient
 endif
 
 ifeq ($(BUILD_GPLV3_ZRTP), 1)
-APP_MODULES += liblincrypto liblinssl
+APP_MODULES += libcrypto-linphone libssl-linphone
 APP_MODULES      += libzrtpcpp
 endif
 
diff --git a/submodules/externals/build/libzrtpcpp/Android.mk b/submodules/externals/build/libzrtpcpp/Android.mk
index 98df312cb..b0d9efaf6 100644
--- a/submodules/externals/build/libzrtpcpp/Android.mk
+++ b/submodules/externals/build/libzrtpcpp/Android.mk
@@ -64,16 +64,7 @@ LOCAL_C_INCLUDES += \
         $(LOCAL_EXTERNALS)/openssl/include 
 
 
-
-# Build dynamic and static versions
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-LOCAL_MODULE:= libzrtpcpp
-LOCAL_SHARED_LIBRARIES := liblinssl liblincrypto
+LOCAL_MODULE := libzrtpcpp
+LOCAL_MODULE_FILENAME := libzrtpcpp-$(TARGET_ARCH_ABI)
+LOCAL_SHARED_LIBRARIES := libssl-linphone libcrypto-linphone
 include $(BUILD_SHARED_LIBRARY)
-else
-LOCAL_STATIC_LIBRARIES := libssl-static libcrypto-static
-LOCAL_MODULE:= libzrtpcpp-static
-include $(BUILD_STATIC_LIBRARY)
-endif
-
-
diff --git a/submodules/externals/build/srtp/Android.mk b/submodules/externals/build/srtp/Android.mk
index ca9b524c2..55ddc64c0 100644
--- a/submodules/externals/build/srtp/Android.mk
+++ b/submodules/externals/build/srtp/Android.mk
@@ -50,17 +50,7 @@ LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/crypto/include 
 
 
+LOCAL_MODULE := libsrtp
+LOCAL_MODULE_FILENAME := libsrtp-$(TARGET_ARCH_ABI)
 
-# Build dynamic and static versions
-ifeq ($(TARGET_ARCH), x86)
-LOCAL_MODULE:= libsrtp
 include $(BUILD_SHARED_LIBRARY)
-else
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-LOCAL_MODULE:= libsrtp
-include $(BUILD_SHARED_LIBRARY)
-else
-LOCAL_MODULE:= libsrtp-static
-include $(BUILD_STATIC_LIBRARY)
-endif
-endif
diff --git a/submodules/linphone b/submodules/linphone
index 946bb0873..9680b2915 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 946bb087335a6602fcbb1ae08b6ca707653617b4
+Subproject commit 9680b2915adcb22a1d14a7c2c7b691c49fa91a3a