diff --git a/.gitmodules b/.gitmodules
index 6d29b9bcf..05f97dd5a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -61,3 +61,6 @@
 [submodule "submodules/msisac"]
 	path = submodules/msisac
 	url = git://git.linphone.org/msisac
+[submodule "submodules/cunit"]
+	path = submodules/cunit
+	url = git://git.linphone.org/cunit.git
diff --git a/submodules/belle-sip b/submodules/belle-sip
index c068cfc7e..76bfd35c0 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit c068cfc7e671d3ec3291553fc40ac63ee749f94b
+Subproject commit 76bfd35c085707db61e0e917f25b4142ffa9f89d
diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk
index 4fe4c1314..c2ec72cc0 100644
--- a/submodules/build/builder-iphone-os.mk
+++ b/submodules/build/builder-iphone-os.mk
@@ -24,22 +24,21 @@ host?=armv7-apple-darwin
 config_site:=iphone-config.site
 library_mode:= --disable-shared --enable-static
 linphone_configure_controls=  \
-			      --disable-strict \
-			      --disable-nls \
-                              --with-readline=none  \
-                              --enable-gtk_ui=no \
-                              --enable-console_ui=no \
-			      --disable-theora \
-			      --disable-sdl \
-			      --disable-x11 \
-			      --enable-bellesip \
-                              --with-gsm=$(prefix) \
-			      --disable-tests \
-			      --disable-tutorials \
-			      --disable-tools \
-                              --with-srtp=$(prefix) \
-                              --with-antlr=$(prefix) \
-                              --disable-msg-storage 
+				--disable-strict \
+				--disable-nls \
+				--with-readline=none  \
+				--enable-gtk_ui=no \
+				--enable-console_ui=no \
+				--disable-theora \
+				--disable-sdl \
+				--disable-x11 \
+				--enable-bellesip \
+				--with-gsm=$(prefix) \
+				--disable-tutorials \
+				--disable-tools \
+				--with-srtp=$(prefix) \
+				--with-antlr=$(prefix) \
+				--disable-msg-storage
 
                               
 #path
@@ -135,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 belle-sip srtp zrtpcpp speex libgsm libvpx libxml2 ffmpeg opus
+SUBMODULES_LIST := polarssl libantlr cunit belle-sip srtp zrtpcpp speex libgsm libvpx libxml2 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/iphone-config.site b/submodules/build/iphone-config.site
index 282e458c7..2c070168e 100644
--- a/submodules/build/iphone-config.site
+++ b/submodules/build/iphone-config.site
@@ -3,11 +3,13 @@
 SDK_VERSION_MAJOR=4
 SDK_VERSION=4.0
 MCPU=""
+CLANG_TARGET_SPECIFIER=miphoneos-version-min
 if test "${host_alias}" = "i386-apple-darwin" ; then 
 	PLATFORM=Simulator
 	ARCH=i386
 	CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=i386"
 	MCPU=""
+	CLANG_TARGET_SPECIFIER=mios-simulator-version-min
 elif test "${host_alias}" = "armv6-apple-darwin" ; then 
 	ARCH=armv6
 	PLATFORM=OS
@@ -40,7 +42,7 @@ fi
 for SYSROOT_PATH in $SDK_PATH_LIST ; do echo $SYSROOT_PATH ; done ;
 echo "Selecting SDK path = ${SYSROOT_PATH}"
 
-COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS -fms-extensions"
+COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -${CLANG_TARGET_SPECIFIER}=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS -fms-extensions"
 CC="xcrun clang -std=c99 $COMMON_FLAGS"
 OBJC="xcrun clang -std=c99 $COMMON_FLAGS"
 CXX="xcrun clang++ $COMMON_FLAGS"
diff --git a/submodules/cunit b/submodules/cunit
new file mode 160000
index 000000000..86562ef04
--- /dev/null
+++ b/submodules/cunit
@@ -0,0 +1 @@
+Subproject commit 86562ef04d0d66c007d7822944a75f540ae37f19
diff --git a/submodules/linphone b/submodules/linphone
index ca5f624bc..9915ab662 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ca5f624bc6480e1a4b35ed0520db18c7fd21bd49
+Subproject commit 9915ab662dd58b4dc736eca90f89466ded059058