diff --git a/submodules/bcg729 b/submodules/bcg729
index cb467db35..2e36a5d4b 160000
--- a/submodules/bcg729
+++ b/submodules/bcg729
@@ -1 +1 @@
-Subproject commit cb467db35848a1e5a3c702dba05e47577bbb5a90
+Subproject commit 2e36a5d4bc6e992c654eee6b0a8db729da7b1d31
diff --git a/submodules/belle-sip b/submodules/belle-sip
index e881f0512..eb3467af3 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit e881f0512913a75d58ffe4ae6edf9139703383cc
+Subproject commit eb3467af3e8f42c5a9cea36d4253bd66641413f3
diff --git a/submodules/build/Makefile b/submodules/build/Makefile
index bd7734354..c717c51ca 100644
--- a/submodules/build/Makefile
+++ b/submodules/build/Makefile
@@ -25,12 +25,19 @@ enable_ffmpeg=yes
 enable_opus=yes
 enable_debug=no
 
+TUNNEL_AVAILABLE=$(shell ls ../tunnel/configure.ac)
+
+
+ifneq ($(TUNNEL_AVAILABLE),)
+enable_tunnel=yes
+endif
+
+
 .NOTPARALLEL all: check_options build warning
 
 # check that the selected options are correct
 CHECKOPT_MSG := ""
 
-
 ifeq ($(enable_gpl_third_parties)$(enable_ffmpeg),noyes)
 # ffmpeg is not compatible with no GPL.
 	enable_ffmpeg:=no
@@ -72,7 +79,7 @@ endif
 
 LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) \
                  enable_zrtp=$(enable_zrtp)   enable_opus=$(enable_opus) \
-                 enable_debug=$(enable_debug) enable_ffmpeg=$(enable_ffmpeg)
+                 enable_debug=$(enable_debug) enable_ffmpeg=$(enable_ffmpeg) enable_tunnel=$(enable_tunnel)
 
 build:
 	make -f  builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all  \
diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk
index 1781501a0..d568ba58f 100644
--- a/submodules/build/builder-iphone-os.mk
+++ b/submodules/build/builder-iphone-os.mk
@@ -23,7 +23,7 @@
 host?=armv7-apple-darwin
 config_site:=iphone-config.site
 library_mode:= --disable-shared --enable-static
-linphone_configure_controls=  \
+linphone_configure_controls = \
 				--with-readline=none  \
 				--enable-gtk_ui=no \
 				--enable-console_ui=no \
@@ -65,6 +65,22 @@ enable_zrtp?=yes
 
 SWITCHES:=
 
+ifeq ($(enable_zrtp), yes)
+                linphone_configure_controls+= --enable-zrtp
+                SWITCHES += enable_zrtp
+else
+                linphone_configure_controls+= --disable-zrtp
+                SWITCHES += disable_zrtp
+endif
+
+ifeq ($(enable_tunnel), yes)
+                linphone_configure_controls+= --enable-tunnel
+                SWITCHES += enable_tunnel
+else
+                linphone_configure_controls+= --disable-tunnel
+                SWITCHES += disable_tunnel
+endif
+
 ifeq ($(enable_gpl_third_parties),yes) 
 	SWITCHES+= enable_gpl_third_parties
 	
@@ -76,14 +92,6 @@ ifeq ($(enable_gpl_third_parties),yes)
 		SWITCHES += disable_ffmpeg
 	endif
 
-	ifeq ($(enable_zrtp), yes)
-		linphone_configure_controls+= --enable-zrtp
-		SWITCHES += enable_zrtp
-	else
-		linphone_configure_controls+= --disable-zrtp
-		SWITCHES += disable_zrtp
-	endif
-
 else # !enable gpl
 	linphone_configure_controls+= --disable-ffmpeg 
 	SWITCHES += disable_gpl_third_parties disable_ffmpeg
@@ -132,9 +140,15 @@ init:
 veryclean: veryclean-linphone veryclean-msbcg729
 	rm -rf $(BUILDER_BUILD_DIR)
 
-# list of the submodules to build
+# list of the submodules to build, the order is important
 MS_MODULES      := msilbc libilbc msamr mssilk msx264 msisac msopenh264
-SUBMODULES_LIST := polarssl libantlr cunit belle-sip srtp speex libgsm libvpx libxml2 bzrtp ffmpeg opus
+SUBMODULES_LIST := polarssl 
+
+ifeq ($(enable_tunnel),yes)
+SUBMODULES_LIST += tunnel
+endif
+
+SUBMODULES_LIST += 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/tunnel.mk b/submodules/build/builders.d/tunnel.mk
index 631251118..6f07fb2c2 100644
--- a/submodules/build/builders.d/tunnel.mk
+++ b/submodules/build/builders.d/tunnel.mk
@@ -9,7 +9,7 @@ $(TUNNEL_BUILD_DIR)/Makefile: $(TUNNEL_SRC_DIR)/configure
 	mkdir -p  $(TUNNEL_BUILD_DIR) \
 	&& cd $(TUNNEL_BUILD_DIR) \
 	&& CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \
-	$(TUNNEL_SRC_DIR)/configure -prefix=$(prefix) --host=$(host) --enable-polarssl --with-polarssl=$(prefix) --disable-servers --without-openssl ${library_mode}
+	$(TUNNEL_SRC_DIR)/configure -prefix=$(prefix) --host=$(host) --enable-polarssl --with-polarssl=$(prefix) --disable-servers  ${library_mode}
 
 build-tunnel: $(TUNNEL_BUILD_DIR)/Makefile
 	cd $(TUNNEL_BUILD_DIR) \
diff --git a/submodules/bzrtp b/submodules/bzrtp
index 7f4c4333c..8ceda7ef0 160000
--- a/submodules/bzrtp
+++ b/submodules/bzrtp
@@ -1 +1 @@
-Subproject commit 7f4c4333c5d8b3b328815996d0eea061bc539860
+Subproject commit 8ceda7ef0d35130057affc2e5a61c0667cde15aa
diff --git a/submodules/externals/openh264 b/submodules/externals/openh264
index fb5700bd5..b2f7191fa 160000
--- a/submodules/externals/openh264
+++ b/submodules/externals/openh264
@@ -1 +1 @@
-Subproject commit fb5700bd5cc18dd33c120ce9dd5f79b8f1f35f3a
+Subproject commit b2f7191fa7e213f5b63b8e31936b962bae6adc2f
diff --git a/submodules/externals/srtp b/submodules/externals/srtp
index 218e54f80..ca0b6a340 160000
--- a/submodules/externals/srtp
+++ b/submodules/externals/srtp
@@ -1 +1 @@
-Subproject commit 218e54f8063426234153cdc977d08bb2d661f011
+Subproject commit ca0b6a3402fed819bbffd4375df7ded209c9d39f
diff --git a/submodules/linphone b/submodules/linphone
index fd8136016..4386f18b2 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit fd813601605e2f4e2cbd70e2cdb96806e3e78e41
+Subproject commit 4386f18b2170445855147f417e6a7d4f04ce728d
diff --git a/submodules/msamr b/submodules/msamr
index 17391e324..d09a19cb2 160000
--- a/submodules/msamr
+++ b/submodules/msamr
@@ -1 +1 @@
-Subproject commit 17391e32465c25feec9b3b44b6967775ea9a56a9
+Subproject commit d09a19cb27076c45f093e8abc9a00d07258779e9
diff --git a/submodules/msilbc b/submodules/msilbc
index d5a47655f..3185bbbbd 160000
--- a/submodules/msilbc
+++ b/submodules/msilbc
@@ -1 +1 @@
-Subproject commit d5a47655f3c7ac64864f9d3a61bb0166eb748b57
+Subproject commit 3185bbbbda97c2b93cd4f720809b96d79d810bd9
diff --git a/submodules/msisac b/submodules/msisac
index e65bcdff6..fafe68323 160000
--- a/submodules/msisac
+++ b/submodules/msisac
@@ -1 +1 @@
-Subproject commit e65bcdff6866d45d0cda6c36a9414a97ad6e917d
+Subproject commit fafe68323df68b5f4e18b15b350134a54888f2b4
diff --git a/submodules/msopenh264 b/submodules/msopenh264
index 863889de4..652fe94fe 160000
--- a/submodules/msopenh264
+++ b/submodules/msopenh264
@@ -1 +1 @@
-Subproject commit 863889de427c70806d6bda87e2f95c3f38662c23
+Subproject commit 652fe94fe6910258ec6cacd85a39071bacbbdca1
diff --git a/submodules/mssilk b/submodules/mssilk
index 07b55ce81..a253e5af9 160000
--- a/submodules/mssilk
+++ b/submodules/mssilk
@@ -1 +1 @@
-Subproject commit 07b55ce81adca894bf6bd1ed86eb27f4578562f1
+Subproject commit a253e5af931cadd5d3c0aff1f56697b2b52c1cfd
diff --git a/submodules/msx264 b/submodules/msx264
index 5f02be80a..853eafee7 160000
--- a/submodules/msx264
+++ b/submodules/msx264
@@ -1 +1 @@
-Subproject commit 5f02be80a66360a8c85ef4f1ae50b617c55b3d05
+Subproject commit 853eafee7cd83ea8c25a673aadb0eb50b7407779
diff --git a/submodules/tunnel b/submodules/tunnel
index a3af29d57..6cae0398a 160000
--- a/submodules/tunnel
+++ b/submodules/tunnel
@@ -1 +1 @@
-Subproject commit a3af29d57b82783dcc5dffcc27e8542dfd9653c3
+Subproject commit 6cae0398a9efb9451e79076479b082edac9335cc