diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk
index ea399394a..a202fe74f 100644
--- a/submodules/build/builder-iphone-os.mk
+++ b/submodules/build/builder-iphone-os.mk
@@ -134,7 +134,7 @@ veryclean: veryclean-linphone veryclean-msbcg729
 
 # list of the submodules to build
 MS_MODULES      := msilbc libilbc msamr mssilk msx264 msisac
-SUBMODULES_LIST := polarssl libantlr cunit belle-sip srtp zrtpcpp speex libgsm libvpx libxml2 ffmpeg opus
+SUBMODULES_LIST := polarssl libantlr cunit belle-sip srtp speex libgsm libvpx libxml2 bzrtp ffmpeg opus
 
 .NOTPARALLEL build-linphone: init $(addprefix build-,$(SUBMODULES_LIST)) mode_switch_check $(LINPHONE_BUILD_DIR)/Makefile
 	cd $(LINPHONE_BUILD_DIR)  && export PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install
diff --git a/submodules/build/builders.d/zrtp.mk b/submodules/build/builders.d/zrtp.mk
index 6a8e6457f..4d5395937 100644
--- a/submodules/build/builders.d/zrtp.mk
+++ b/submodules/build/builders.d/zrtp.mk
@@ -1,28 +1,60 @@
-zrtpcpp_dir=externals/zrtpcpp
-$(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) -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 "
-# Used toolchain: $(TC)
+############################################################################
+# zrtp.mk
+# Copyright (C) 2014  Belledonne Communications,Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+############################################################################
+bzrtp_dir?=bzrtp
+enable_zrtp?=yes
 
+$(BUILDER_SRC_DIR)/$(bzrtp_dir)/configure:
+	@echo -e "\033[01;32m Running autogen for bzrtp in $(BUILDER_SRC_DIR)/$(bzrtp_dir) \033[0m"
+	cd $(BUILDER_SRC_DIR)/$(bzrtp_dir) && ./autogen.sh
 
-build-zrtpcpp: $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile
-	@echo "Build ZRTP - prefix $(prefix)"
-	cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) \
-	&& host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \
-	&& make VERBOSE=1 && make install
+$(BUILDER_BUILD_DIR)/$(bzrtp_dir)/Makefile: $(BUILDER_SRC_DIR)/$(bzrtp_dir)/configure
+	@echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(bzrtp_dir) \033[0m"
+	mkdir -p $(BUILDER_BUILD_DIR)/$(bzrtp_dir)
+	cd $(BUILDER_BUILD_DIR)/$(bzrtp_dir)/ \
+		&& PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
+		$(BUILDER_SRC_DIR)/$(bzrtp_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \
+		--enable-static
 
-clean-zrtpcpp:
-	-cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) && make clean
+ifeq ($(enable_zrtp),yes)
 
-clean-makefile-zrtpcpp: clean-zrtpcpp
-	-rm -f $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile
+build-bzrtp: $(BUILDER_BUILD_DIR)/$(bzrtp_dir)/Makefile
+	@echo -e "\033[01;32m building bzrtp \033[0m"
+	cd $(BUILDER_BUILD_DIR)/$(bzrtp_dir) \
+		&& PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig \
+		CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
+		make -j1 && make install
 
-veryclean-zrtpcpp:
-	-rm -rf $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)
+else
+build-bzrtp:
+	@echo "ZRTP is disabled"
 
+endif
 
+clean-bzrtp:
+	-cd  $(BUILDER_BUILD_DIR)/$(bzrtp_dir) && make clean
+
+veryclean-bzrtp:
+	-cd $(BUILDER_BUILD_DIR)/$(bzrtp_dir) && make distclean
+	rm -f $(BUILDER_SRC_DIR)/$(bzrtp_dir)/configure
+
+clean-makefile-bzrtp:
+	-cd $(BUILDER_BUILD_DIR)/$(bzrtp_dir) && rm -f Makefile