diff --git a/.gitmodules b/.gitmodules
index 9fa5f9aec..3a012aaaa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -36,7 +36,7 @@
 	url = http://git.chromium.org/webm/libvpx.git
 [submodule "submodules/externals/libzrtpcpp"]
 	path = submodules/externals/libzrtpcpp
-	url = git://git.linphone.org/zrtpcpp.git
+	url = https://github.com/wernerd/ZRTPCPP.git
 [submodule "submodules/externals/srtp"]
 	path = submodules/externals/srtp
 	url = git://git.linphone.org/srtp.git
diff --git a/Makefile b/Makefile
index 17b6c0024..304be1d56 100644
--- a/Makefile
+++ b/Makefile
@@ -219,15 +219,15 @@ endif
 
 
 #Zrtp
-$(TOPDIR)/submodules/externals/libzrtpcpp/libzrtpcpp-config.h : $(TOPDIR)/submodules/externals/build/libzrtpcpp/libzrtpcpp-config.h
-	@cd $(TOPDIR)/submodules/externals/libzrtpcpp/ && \
-	cp ../build/libzrtpcpp/libzrtpcpp-config.h . \
+#$(TOPDIR)/submodules/externals/libzrtpcpp/libzrtpcpp-config.h : $(TOPDIR)/submodules/externals/build/libzrtpcpp/libzrtpcpp-config.h
+#	@cd $(TOPDIR)/submodules/externals/libzrtpcpp/ && \
+#	cp ../build/libzrtpcpp/libzrtpcpp-config.h . \
 	|| ( echo "ZRTP prepare state failed." ; exit 1 )
-ifeq ($(BUILD_GPLV3_ZRTP), 1)
-prepare-zrtp: $(TOPDIR)/submodules/externals/libzrtpcpp/libzrtpcpp-config.h
-else
+#ifeq ($(BUILD_GPLV3_ZRTP), 1)
+#prepare-zrtp: $(TOPDIR)/submodules/externals/libzrtpcpp/libzrtpcpp-config.h
+#else
 prepare-zrtp:
-endif
+#endif
 
 
 
diff --git a/jni/Android.mk b/jni/Android.mk
index aab6873ff..ae580fb03 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -20,7 +20,8 @@ endif
 ifeq ($(BUILD_GPLV3_ZRTP), 1)
 	BUILD_SRTP=1
 ZRTP_C_INCLUDE= \
-	$(linphone-root-dir)/submodules/externals/libzrtpcpp/src
+	$(linphone-root-dir)/submodules/externals/libzrtpcpp/zrtp \
+	$(linphone-root-dir)/submodules/externals/libzrtpcpp/zrtp/libzrtpcpp
 endif
 
 ifeq ($(BUILD_SRTP), 1)
diff --git a/jni/Application.mk b/jni/Application.mk
index b645eaae9..6a4e216ac 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -115,7 +115,6 @@ endif
 endif
 
 ifeq ($(BUILD_GPLV3_ZRTP), 1)
-APP_MODULES += libcrypto-linphone libssl-linphone
 APP_MODULES      += libzrtpcpp
 endif
 
diff --git a/submodules/externals/build/libzrtpcpp/libzrtpcpp-config.h b/submodules/externals/build/libzrtpcpp/libzrtpcpp-config.h
deleted file mode 100644
index 191321486..000000000
--- a/submodules/externals/build/libzrtpcpp/libzrtpcpp-config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-/* Define to 1 if you have the <gcrypt.h> header file. */
-/* #undef HAVE_GCRYPT_H */
-
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-/* #undef HAVE_LIBPTHREAD */
-
-/* Define to 1 if you have the <openssl/aes.h> header file. */
-#define  HAVE_OPENSSL_AES_H 1
-
-/* Define to 1 if you have the <openssl/bn.h> header file. */
-#define  HAVE_OPENSSL_BN_H 1
-
-/* Define to 1 if you have the <openssl/sha.h> header file. */
-#define  HAVE_OPENSSL_SHA_H 1
-
-/* Define to 1 if you have the <pthread.h> header file. */
-#define  HAVE_PTHREAD_H 1
-
-/* Name of package */
-#define PACKAGE libzrtpcpp
-
-/* Version number of package */
-#define  VERSION 2.1.0
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to rpl_malloc if the replacement function should be used. */
-#undef malloc
-
-/* Define to the equivalent of the C99 'restrict' keyword, or to
-   nothing if this is not supported.  Do not define if restrict is
-   supported directly.  */
-#undef restrict
-/* Work around a bug in Sun C++: it does not support _Restrict, even
-   though the corresponding Sun C compiler does, which causes
-   "#define restrict _Restrict" in the previous line.  Perhaps some future
-   version of Sun C++ will work with _Restrict; if so, it'll probably
-   define __RESTRICT, just as Sun C does.  */
-#if defined __SUNPRO_CC && !defined __RESTRICT
-# define _Restrict
-#endif
-
-/* Define to empty if the keyword `volatile' does not work. Warning: valid
-   code using `volatile' can become incorrect without. Disable with care. */
-#undef volatile
diff --git a/submodules/externals/libzrtpcpp b/submodules/externals/libzrtpcpp
index bfbfcab72..f07896e38 160000
--- a/submodules/externals/libzrtpcpp
+++ b/submodules/externals/libzrtpcpp
@@ -1 +1 @@
-Subproject commit bfbfcab72dfa27862b05607d18bb24b6f8395fcf
+Subproject commit f07896e38151fa06f5c2527de5470294b2012242
diff --git a/submodules/externals/srtp b/submodules/externals/srtp
index 14027d37c..d719bf151 160000
--- a/submodules/externals/srtp
+++ b/submodules/externals/srtp
@@ -1 +1 @@
-Subproject commit 14027d37c7574b27bf22e57f508137b4e86b6466
+Subproject commit d719bf1510a485b6760f76c95b8813bdc60781f6