diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk
new file mode 100644
index 000000000..0419916a8
--- /dev/null
+++ b/submodules/build/builder-iphone-os.mk
@@ -0,0 +1,283 @@
+############################################################################
+# builder-generic.mk 
+# Copyright (C) 2009  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.
+#
+############################################################################
+ 
+host?=armv6-apple-darwin
+config_site:=iphone-config.site
+library_mode:= --disable-shared --enable-static
+linphone_configure_controls=  --disable-video \
+                              --with-readline=none  \
+                              --enable-gtk_ui=no \
+                              --enable-ssl-hmac=no \
+                              --enable-macaqsnd=no \
+                              --enable-iounit=yes \
+                              --with-gsm=$(prefix) \
+                              --enable-nonstandard-gsm \
+                              SPEEX_CFLAGS="-I$(prefix)/include" \
+                              SPEEX_LIBS="-L$(prefix)/lib -lspeex "
+
+#path
+BUILDER_SRC_DIR?=$(shell pwd)/../
+BUILDER_BUILD_DIR?=$(shell pwd)/../build-$(host)
+
+LINPHONE_SRC_DIR=$(BUILDER_SRC_DIR)/linphone
+LINPHONE_BUILD_DIR=$(BUILDER_BUILD_DIR)/linphone
+
+osip_dir?=externals/osip
+
+eXosip_dir?=externals/exosip
+
+speex_dir?=externals/speex
+
+gsm_dir?=externals/gsm
+
+MSILBC_SRC_DIR:=$(BUILDER_SRC_DIR)/msilbc
+MSILBC_BUILD_DIR:=$(BUILDER_BUILD_DIR)/msilbc
+
+LIBILBC_SRC_DIR:=$(BUILDER_SRC_DIR)/libilbc-rfc3951
+LIBILBC_BUILD_DIR:=$(BUILDER_BUILD_DIR)/libilbc-rfc3951
+
+ifneq (,$(findstring arm,$(host)))
+	SPEEX_CONFIGURE_OPTION := --enable-fixed-point --disable-float-api
+	#SPEEX_CONFIGURE_OPTION := --enable-arm5e-asm --enable-fixed-point
+endif
+
+
+prefix?=$(BUILDER_SRC_DIR)/../liblinphone-sdk/$(host)
+
+all: build-linphone build-msilbc
+
+clean-makefile: clean-makefile-linphone
+clean: clean-linphone
+
+
+veryclean:
+	rm -rf $(BUILDER_BUILD_DIR)
+
+build-linphone: build-osip2 build-eXosip2  build-speex build-libgsm $(LINPHONE_BUILD_DIR)/Makefile
+	cd $(LINPHONE_BUILD_DIR) && make newdate && make  && make install
+
+clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm  clean-msilbc clean-libilbc
+	cd  $(LINPHONE_BUILD_DIR) && make clean
+
+veryclean-linphone: clean-linphone veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-libgsm veryclean-msiounit veryclean-msilbc veryclean-libilbc
+	cd $(LINPHONE_BUILD_DIR) && make distclean
+	cd $(LINPHONE_SRC_DIR) && rm -f configure
+
+clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-msiounit clean-makefile-libilbc clean-makefile-msilbc
+	cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile
+
+
+$(LINPHONE_SRC_DIR)/configure:
+	cd $(LINPHONE_SRC_DIR) && ./autogen.sh
+
+$(LINPHONE_BUILD_DIR)/Makefile: $(LINPHONE_SRC_DIR)/configure
+	mkdir -p $(LINPHONE_BUILD_DIR)
+	cd $(LINPHONE_BUILD_DIR) && \
+	PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
+	$(LINPHONE_SRC_DIR)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \
+	${linphone_configure_controls}
+	
+
+#libphone only (asume dependencies are met)
+build-liblinphone:	$(LINPHONE_BUILD_DIR)/Makefile 
+	 cd $(LINPHONE_BUILD_DIR) && make newdate && make  && make install 
+
+clean-makefile-liblinphone:   
+	 cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile	 
+	 
+clean-liblinphone: 
+	 cd  $(LINPHONE_BUILD_DIR) && make clean
+#osip2
+
+$(BUILDER_SRC_DIR)/$(osip_dir)/configure:
+	 cd $(BUILDER_SRC_DIR)/$(osip_dir) && ./autogen.sh
+
+$(BUILDER_BUILD_DIR)/$(osip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(osip_dir)/configure
+	mkdir -p $(BUILDER_BUILD_DIR)/$(osip_dir)
+	cd $(BUILDER_BUILD_DIR)/$(osip_dir)/ \
+	&& CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
+	$(BUILDER_SRC_DIR)/$(osip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode}  
+
+build-osip2: $(BUILDER_BUILD_DIR)/$(osip_dir)/Makefile
+	 cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make && make install
+
+clean-osip2:
+	 cd  $(BUILDER_BUILD_DIR)/$(osip_dir) && make clean
+
+veryclean-osip2:
+	 cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make distclean
+	 cd $(BUILDER_SRC_DIR)/$(osip_dir) && rm -f configure
+
+clean-makefile-osip2:
+	 cd $(BUILDER_BUILD_DIR)/$(osip_dir) && rm -f Makefile
+#eXosip
+
+$(BUILDER_SRC_DIR)/$(eXosip_dir)/configure:
+	 cd $(BUILDER_SRC_DIR)/$(eXosip_dir) && ./autogen.sh
+	 
+$(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure
+	mkdir -p $(BUILDER_BUILD_DIR)/$(eXosip_dir)
+	cd $(BUILDER_BUILD_DIR)/$(eXosip_dir)/\
+	&& PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig  CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
+	$(BUILDER_SRC_DIR)/$(eXosip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} --disable-tools 
+
+build-eXosip2: $(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile
+	 cd $(BUILDER_BUILD_DIR)/$(eXosip_dir)  && make  && make install
+
+clean-eXosip2:
+	 cd  $(BUILDER_BUILD_DIR)/$(eXosip_dir)  && make clean
+
+veryclean-eXosip2:
+	 cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && make distclean
+
+clean-makefile-eXosip2:
+	 cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && rm -f Makefile
+
+#speex
+
+$(BUILDER_SRC_DIR)/$(speex_dir)/configure:
+	 cd $(BUILDER_SRC_DIR)/$(speex_dir) && ./autogen.sh
+
+$(BUILDER_BUILD_DIR)/$(speex_dir)/Makefile: $(BUILDER_SRC_DIR)/$(speex_dir)/configure
+	mkdir -p $(BUILDER_BUILD_DIR)/$(speex_dir)
+	cd $(BUILDER_BUILD_DIR)/$(speex_dir)/\
+	&& CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
+	$(BUILDER_SRC_DIR)/$(speex_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} --disable-oggtest $(SPEEX_CONFIGURE_OPTION)
+
+build-speex: $(BUILDER_BUILD_DIR)/$(speex_dir)/Makefile
+	 cd $(BUILDER_BUILD_DIR)/$(speex_dir)/libspeex && make  && make install
+	 cd $(BUILDER_BUILD_DIR)/$(speex_dir)/include  && make &&  make install
+
+clean-speex:
+	 cd  $(BUILDER_BUILD_DIR)/$(speex_dir)  && make clean
+
+veryclean-speex:
+	 cd $(BUILDER_BUILD_DIR)/$(speex_dir) && make distclean
+
+clean-makefile-speex:
+	 cd $(BUILDER_SRC_DIR)/$(speex_dir) && rm -f Makefile
+
+#GSM
+
+build-libgsm:
+	cp -rf $(BUILDER_SRC_DIR)/$(gsm_dir) $(BUILDER_BUILD_DIR)/$(gsm_dir)
+	rm -f $(prefix)/lib/libgsm.a
+	rm -rf $(prefix)/include/gsm
+	cd $(BUILDER_BUILD_DIR)/$(gsm_dir)\
+	&& mkdir -p $(prefix)/include/gsm \
+	&& host_alias=$(host)  . $(BUILDER_SRC_DIR)/build/$(config_site) \
+	&&  make CC="$${CC}" INSTALL_ROOT=$(prefix)  GSM_INSTALL_INC=$(prefix)/include/gsm  install
+
+clean-libgsm:
+	cd $(BUILDER_BUILD_DIR)/$(gsm_dir)\
+	&& make clean
+
+veryclean-libgsm: clean-libgsm
+	 cd $(BUILDER_BUILD_DIR)/$(gsm_dir)) \
+	&& make uninstall
+
+
+
+# msilbc  plugin
+
+$(MSILBC_SRC_DIR)/configure:
+	cd $(MSILBC_SRC_DIR) && ./autogen.sh
+
+$(MSILBC_BUILD_DIR)/Makefile: $(MSILBC_SRC_DIR)/configure
+	mkdir -p $(MSILBC_BUILD_DIR)
+	cd $(MSILBC_BUILD_DIR) && \
+	PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
+	$(MSILBC_SRC_DIR)/configure -prefix=$(prefix) --host=$(host) $(library_mode)
+
+build-msilbc: build-libilbc $(MSILBC_BUILD_DIR)/Makefile
+	cd $(MSILBC_BUILD_DIR) && make  && make install
+
+clean-msilbc:
+	cd  $(MSILBC_BUILD_DIR) && make clean
+
+veryclean-msilbc:
+	cd $(MSILBC_BUILD_DIR) && make distclean
+	cd $(MSILBC_SRC_DIR) && rm configure
+
+clean-makefile-msilbc:
+	cd $(MSILBC_SRC_DIR) && rm Makefile
+
+# libilbc
+
+$(LIBILBC_SRC_DIR)/configure:
+	cd $(LIBILBC_SRC_DIR) && ./autogen.sh
+
+$(LIBILBC_BUILD_DIR)/Makefile: $(LIBILBC_SRC_DIR)/configure
+	mkdir -p $(LIBILBC_BUILD_DIR)
+	cd $(LIBILBC_BUILD_DIR) && \
+	PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
+	$(LIBILBC_SRC_DIR)/configure -prefix=$(prefix) --host=$(host) $(library_mode)
+
+build-libilbc: $(LIBILBC_BUILD_DIR)/Makefile
+	cd $(LIBILBC_BUILD_DIR) && make  && make install
+
+clean-libilbc:
+	cd  $(LIBILBC_BUILD_DIR) && make clean
+
+veryclean-libilbc:
+	cd $(LIBILBC_BUILD_DIR) && make distclean
+	cd $(LIBILBC_SRC_DIR) && rm -f configure
+
+clean-makefile-libilbc:
+	cd $(LIBILBC_BUILD_DIR) && rm -f Makefile
+
+
+#sdk generation and distribution
+
+multi-arch:
+	arm_archives=`find $(prefix) -name *.a` ;\
+	mkdir -p $(prefix)/../apple-darwin; \
+	cp -rf $(prefix)/include  $(prefix)/../apple-darwin/. ; \
+	cp -rf $(prefix)/share  $(prefix)/../apple-darwin/. ; \
+	for archive in $$arm_archives ; do \
+	        i386_path=`echo $$archive | sed -e "s/armv6/i386/"` ;\
+        	destpath=`echo $$archive | sed -e "s/armv6-//"` ;\
+        	if test -f "$$i386_path"; then \
+                	echo "Mixing $$archive and $$i386_path into $$destpath"; \
+                	mkdir -p `dirname $$destpath` ; \
+                	lipo -create $$archive $$i386_path -output $$destpath; \
+        	else \
+                	echo "WARNING: archive `basename $$archive` exists in arm tree but does not exists in i386 tree."; \
+        	fi \
+	done
+
+
+delivery-sdk: multi-arch
+	cd $(BUILDER_SRC_DIR)/../ \
+	&& zip  -r   $(BUILDER_SRC_DIR)/liblinphone-iphone-sdk.zip \
+	liblinphone-sdk/apple-darwin
+
+delivery:
+	cd $(BUILDER_SRC_DIR)/../ \
+	&& zip  -r   $(BUILDER_SRC_DIR)/linphone-iphone.zip \
+	liblinphone-sdk linphone-iphone linphone/pixmaps/red.png \
+	linphone/pixmaps/green.png linphone/share/ringback.wav \
+	linphone/share/rings/oldphone-mono.wav \
+	-x linphone-iphone/build\* \
+	-x \*.git\*
+
+
diff --git a/submodules/build/builder-iphone-simulator.mk b/submodules/build/builder-iphone-simulator.mk
new file mode 100644
index 000000000..ea2363be5
--- /dev/null
+++ b/submodules/build/builder-iphone-simulator.mk
@@ -0,0 +1,24 @@
+############################################################################
+#  builder-iphone-simulator.mk
+#  Copyright (C) 2009  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.
+#
+############################################################################
+host:=i386-apple-darwin
+include builder-iphone-os.mk
+
diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site
new file mode 100644
index 000000000..8fe007b12
--- /dev/null
+++ b/submodules/build/iphone-config.site
@@ -0,0 +1,28 @@
+# -*- shell-script -*-
+
+GCC_VERSION=4.2
+SDK_VERSION=4.0
+
+if test "${host_alias}" = "i386-apple-darwin" ; then 
+	PLATFORM=Simulator
+	ARCH=i386
+elif test "${host_alias}" = "armv6-apple-darwin" ; then 
+	ARCH=armv6
+	PLATFORM=OS
+else 
+	echo "bad host ${host_alias} must be either i386-apple-darwin or armv6-apple-darwin"
+	exit
+fi
+echo "Loading config.site for iPhone platform=${PLATFORM} version=${SDK_VERSION}"
+
+SDK_BIN_PATH=/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin     
+SYSROOT_PATH=/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}${SDK_VERSION}.sdk
+
+CC="${SDK_BIN_PATH}/gcc-${GCC_VERSION} -std=c99 -arch ${ARCH} --sysroot=${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION}"
+CXX="${SDK_BIN_PATH}/g++-${GCC_VERSION} -arch ${ARCH} --sysroot=${SYSROOT_PATH}"
+LD="${SDK_BIN_PATH}/ld-${GCC_VERSION} -arch ${ARCH}"
+AR=${SDK_BIN_PATH}/ar
+RANLIB=${SDK_BIN_PATH}/ranlib
+
+CPPFLAGS="-Dasm=__asm"
+LDFLAGS="-Wl,-syslibroot,${SYSROOT_PATH}"