diff --git a/build/android/Android.mk b/build/android/Android.mk
index 47098be79..f009cf295 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/mediastreamer2 b/mediastreamer2
index 17471b986..fa2231095 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 17471b98625bc6096427351ba78f290740d15265
+Subproject commit fa22310955303f6a2185fec8c5610aa6f24b46fb
diff --git a/oRTP b/oRTP
index c0418933b..dc4197cfc 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit c0418933b7ce4765993b7304809e43df6ed392dd
+Subproject commit dc4197cfceb4074018a0b7ad22a3c24fa454c129