diff --git a/build/android/Android.mk b/build/android/Android.mk
index 47098be791f1ad9bae0d6c28128244a258f9a156..f009cf29527bdd6eaa961d04801e8c44e538cc87 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -201,7 +201,7 @@ LOCAL_CFLAGS += $(LIBLINPHONE_EXTENDED_CFLAGS)
 
 ifeq ($(BUILD_GPLV3_ZRTP),1)
 	LOCAL_SHARED_LIBRARIES += libssl-linphone libcrypto-linphone
-	LOCAL_SHARED_LIBRARIES += libzrtpcpp
+	LOCAL_SHARED_LIBRARIES += libbzrtp
 endif
 
 ifeq ($(BUILD_SRTP),1)
diff --git a/oRTP b/oRTP
index b2e5f313e6f245588751835ccd01bcd5dc2e8b1e..d3a18ddcf22f20480c7a1d9e38819e375d3c4d05 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit b2e5f313e6f245588751835ccd01bcd5dc2e8b1e
+Subproject commit d3a18ddcf22f20480c7a1d9e38819e375d3c4d05