diff --git a/.gitmodules b/.gitmodules
index 5a5396802..6d29b9bcf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -33,7 +33,7 @@
 	url = http://git.chromium.org/webm/libvpx.git
 [submodule "submodules/externals/zrtpcpp"]
 	path = submodules/externals/zrtpcpp
-	url = git://git.linphone.org/zrtpcpp.git
+	url =  https://github.com/wernerd/ZRTPCPP.git 
 [submodule "submodules/mssilk"]
 	path = submodules/mssilk
 	url = git://git.linphone.org/mssilk.git
diff --git a/submodules/build/builders.d/zrtp.mk b/submodules/build/builders.d/zrtp.mk
index 4a9ae96c7..6a8e6457f 100644
--- a/submodules/build/builders.d/zrtp.mk
+++ b/submodules/build/builders.d/zrtp.mk
@@ -3,7 +3,7 @@ $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile:
 	mkdir -p $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)
 	cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/\
         && host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \
-        && cmake $(BUILDER_SRC_DIR)/$(zrtpcpp_dir) -Denable-ccrtp=false -DCMAKE_TOOLCHAIN_FILE=$(BUILDER_SRC_DIR)build/iphone-toolchain.cmake  \
+        && cmake $(BUILDER_SRC_DIR)/$(zrtpcpp_dir) -DCORE_LIB=true -DSDES=false -DCMAKE_TOOLCHAIN_FILE=$(BUILDER_SRC_DIR)build/iphone-toolchain.cmake  \
 	-LH -Wdev -DCMAKE_C_COMPILER=`xcrun --find clang` -DCMAKE_CXX_COMPILER=`xcrun --find clang` \
 	-DCMAKE_SYSTEM_PROCESSOR=$$ARCH -DCMAKE_C_FLAGS="$$COMMON_FLAGS" -DCMAKE_CXX_FLAGS="$$COMMON_FLAGS" \
 	-DCMAKE_INSTALL_PREFIX=$(prefix) -DCMAKE_FIND_ROOT_PATH="$(prefix) -DBUILD_STATIC=ON "
diff --git a/submodules/externals/srtp b/submodules/externals/srtp
index 14027d37c..218e54f80 160000
--- a/submodules/externals/srtp
+++ b/submodules/externals/srtp
@@ -1 +1 @@
-Subproject commit 14027d37c7574b27bf22e57f508137b4e86b6466
+Subproject commit 218e54f8063426234153cdc977d08bb2d661f011
diff --git a/submodules/externals/zrtpcpp b/submodules/externals/zrtpcpp
index bfbfcab72..4473ee0f9 160000
--- a/submodules/externals/zrtpcpp
+++ b/submodules/externals/zrtpcpp
@@ -1 +1 @@
-Subproject commit bfbfcab72dfa27862b05607d18bb24b6f8395fcf
+Subproject commit 4473ee0f94a0b8dde180f2f8d9c3684c80bd1e86
diff --git a/submodules/linphone b/submodules/linphone
index e8d63aa3b..c2ca9f8c0 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit e8d63aa3bae0a13788fdb09a9499190eb406f4c3
+Subproject commit c2ca9f8c089b1b6ed8e7bc1f2bfa8d5a5defc524