diff --git a/submodules/build/Makefile b/submodules/build/Makefile
index 5b0edbc11..713d9848b 100644
--- a/submodules/build/Makefile
+++ b/submodules/build/Makefile
@@ -20,7 +20,7 @@
 #
 ############################################################################
 enable_gpl_third_parties=yes
-enable_zrtp=no
+enable_zrtp=yes
 enable_ffmpeg=yes
 enable_opus=yes
 enable_debug=no
@@ -31,7 +31,8 @@ enable_debug=no
 CHECKOPT_MSG := ""
 
 ifeq ($(enable_gpl_third_parties)$(enable_zrtp),noyes)
-	CHECKOPT_MSG += "ZRTP is not available in non-gpl build.\n"
+	CHECKOPT_MSG += "ZRTP is not available in non-gpl build. disabling\n"
+	enable_zrtp=yes
 endif
 
 ifeq ($(enable_gpl_third_parties)$(enable_ffmpeg),noyes)
@@ -42,7 +43,6 @@ endif
 ifneq ($(CHECKOPT_MSG),"")
 check_options:
 	@echo $(CHECKOPT_MSG)
-	@exit -1
 else
 check_options:
 endif
diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk
index 8d649f120..9bf6ca23e 100644
--- a/submodules/build/builder-iphone-os.mk
+++ b/submodules/build/builder-iphone-os.mk
@@ -29,8 +29,6 @@ linphone_configure_controls=  \
                               --with-readline=none  \
                               --enable-gtk_ui=no \
                               --enable-console_ui=no \
-                              --enable-ssl-hmac=no \
-                              --enable-ssl=no \
 			      --disable-theora \
 			      --disable-sdl \
 			      --disable-x11 \
@@ -38,6 +36,7 @@ linphone_configure_controls=  \
                               --with-gsm=$(prefix) \
 			      --disable-tests \
 			      --disable-tutorials \
+			      --disable-tools \
                               --with-srtp=$(prefix) \
                               --with-antlr=$(prefix) \
                               --disable-msg-storage 
diff --git a/submodules/linphone b/submodules/linphone
index 638671275..f0250b5a5 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 638671275f9a74e8bc2bf1ced7327e60e69c36a8
+Subproject commit f0250b5a5fb9cb6a2bbf0432f7b4bb352189dafe