diff --git a/.gitmodules b/.gitmodules
index a21a0a5c3..fde6a7a47 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,6 @@
 [submodule "linphone"]
 	path = submodules/linphone
-	url = git://git.linphone.org/linphone.git
-[submodule "submodules/externals/osip"]
-	path = submodules/externals/osip
-	url = git://git.linphone.org/osip.git
-[submodule "submodules/externals/exosip"]
-	path = submodules/externals/exosip
-	url = git://git.linphone.org/exosip.git
+	url = gitosis@git.linphone.org:linphone-private
 [submodule "submodules/externals/gsm"]
 	path = submodules/externals/gsm
 	url = git://git.linphone.org/gsm.git
@@ -58,3 +52,9 @@
 [submodule "submodules/externals/webrtc"]
 	path = submodules/externals/webrtc
 	url = git://git.linphone.org/webrtc.git
+[submodule "submodules/belle-sip"]
+	path = submodules/belle-sip
+	url = gitosis@git.linphone.org:belle-sip
+[submodule "submodules/externals/libantlr3c"]
+	path = submodules/externals/libantlr3c
+	url = gitosis@git.linphone.org:libantlr3c
diff --git a/Makefile b/Makefile
index 48c0055f4..159b3a8f7 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon)
 LINPHONE_VERSION=$(shell cd submodules/linphone && git describe)
 LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe)
 ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1)
-
 BUILD_X264=0
 BUILD_AMRNB=full # 0, light or full
 BUILD_AMRWB=0
@@ -19,6 +18,13 @@ BUILD_WEBRTC_AECM=1
 BUILD_FOR_X86=1
 USE_JAVAH=1
 
+# Checks
+CHECK_MSG=$(shell ./check_tools.sh)
+ifneq ($(CHECK_MSG),)
+    $(error $(CHECK_MSG))
+endif
+include check_tools.mk
+
 all: update-project prepare-sources generate-apk
 
 install: install-apk run-linphone
@@ -84,7 +90,18 @@ prepare-mediastreamer2:
 	if ! [ -e yuv2rgb.vs.h ]; then echo "yuv2rgb.vs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi && \
 	if ! [ -e yuv2rgb.fs.h ]; then echo "yuv2rgb.fs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi
 
-prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2
+
+LIBANLTR3C_SRC_DIR=$(TOPDIR)/submodules/externals/libantlr3c
+LIBANTLR3C_BUILD_DIR=$(LIBANTLR3C_SRC_DIR)
+prepare-libantlr3c: $(TOPDIR)/submodules/externals/build/libantlr3c/antlr3config.h
+	cp $(TOPDIR)/submodules/externals/build/libantlr3c/antlr3config.h $(LIBANLTR3C_SRC_DIR)
+
+BELLESIP_SRC_DIR=$(TOPDIR)/submodules/belle-sip
+BELLESIP_BUILD_DIR=$(BELLESIP_SRC_DIR)
+prepare-belle-sip:
+	$(ANTLR) -make -fo $(BELLESIP_BUILD_DIR)/src/ $(BELLESIP_SRC_DIR)/src/belle_sip_message.g $(BELLESIP_SRC_DIR)/src/belle_sdp.g
+
+prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2 prepare-libantlr3c prepare-belle-sip
 
 generate-libs:
 	$(NDK_PATH)/ndk-build LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_X264=$(BUILD_X264) BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_FOR_X86=$(BUILD_FOR_X86) USE_JAVAH=$(USE_JAVAH) -j$(NUMCPUS)
diff --git a/check_tools.sh b/check_tools.sh
new file mode 100755
index 000000000..0a163e8e9
--- /dev/null
+++ b/check_tools.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+rm -f check_tools.mk
+touch check_tools.mk
+
+# Check java
+JAVA=\"$(which java)\"
+if [ -z ${JAVA} ]; then 
+	echo "Could not find java. Please install java";
+	exit -1;
+fi
+
+# Check antlr
+antlr_java_prefixes="/usr/share/java /usr/local/share/java /usr/share/java /opt/local/share/java"
+antlr_jar="no"
+for antlr_java_prefix in ${antlr_java_prefixes}
+do
+	antlr_jar=${antlr_java_prefix}/antlr.jar
+	if [ ! -f ${antlr_jar} ]; then
+		antlr_jar="no"	
+	else
+		break;
+	fi
+done
+if test ${antlr_jar} = "no" ; then
+	echo "Could not find antlr.jar. Please install antlr3";
+	exit -1;
+fi
+ANTLR="${JAVA} -jar \"${antlr_jar}\"";
+
+# Check NDK
+NDK=$(which ndk-build)
+if [ -z ${NDK} ]; then 
+	echo "Could not find ndk-build. Please install android ndk";
+	exit -1;
+fi
+
+# Check SDK
+SDK=$(which android)
+if [ -z ${SDK} ]; then 
+	echo "Could not find android. Please install android sdk";
+	exit -1;
+fi
+
+SDK_PLATFORM_TOOLS=$(which adb)
+if [ -z ${SDK_PLATFORM_TOOLS} ]; then 
+	echo "Could not find adb. Please install android sdk platform tools";
+	exit -1;
+fi
+
+echo JAVA=${JAVA} >> check_tools.mk
+echo ANTLR=${ANTLR} >> check_tools.mk
diff --git a/jni/Android.mk b/jni/Android.mk
index 300f025e0..c787daade 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -51,9 +51,9 @@ else
 include $(linphone-root-dir)/submodules/externals/prebuilts/gsm.mk
 endif
 
-include $(linphone-root-dir)/submodules/externals/build/exosip/Android.mk
 
-include $(linphone-root-dir)/submodules/externals/build/osip/Android.mk
+include $(linphone-root-dir)/submodules/externals/build/libantlr3c/Android.mk
+include $(linphone-root-dir)/submodules/belle-sip/build/android/Android.mk
 
 # Openssl
 ifeq ($(wildcard $(linphone-root-dir)/submodules/externals/prebuilts/ssl.mk),)
diff --git a/jni/Application.mk b/jni/Application.mk
index 224f4faa8..a0cd63919 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,5 +1,5 @@
 APP_PROJECT_PATH := $(call my-dir)/../
-APP_MODULES      :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 liblinphone liblinphonenoneon libneon
+APP_MODULES      :=libspeex libgsm libortp libantlr3c libbellesip libmediastreamer2 liblinphone liblinphonenoneon libneon
 APP_STL := stlport_static
 
 #default values
diff --git a/submodules/belle-sip b/submodules/belle-sip
new file mode 160000
index 000000000..3d52f64ac
--- /dev/null
+++ b/submodules/belle-sip
@@ -0,0 +1 @@
+Subproject commit 3d52f64ac2b26724c99b2c660b74d3c9e2f9a5c2
diff --git a/submodules/externals/build/exosip/Android.mk b/submodules/externals/build/exosip/Android.mk
deleted file mode 100755
index 761e2ef2c..000000000
--- a/submodules/externals/build/exosip/Android.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-
-LOCAL_PATH:= $(call my-dir)/../../exosip
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libeXosip2
-
-# Don't prelink this library.  
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_SRC_FILES = \
-	src/eXosip.c \
-	src/eXconf.c \
-	src/eXregister_api.c \
-	src/eXcall_api.c \
-	src/eXmessage_api.c \
-	src/eXtransport.c \
-	src/jrequest.c \
-	src/jresponse.c \
-	src/jcallback.c \
-	src/jdialog.c \
-	src/udp.c \
-	src/jcall.c \
-	src/jreg.c \
-	src/eXutils.c \
-	src/jevents.c \
-	src/misc.c \
-	src/jauth.c \
-	src/eXosip_transport_hook.c
-
-LOCAL_SRC_FILES += \
-	src/eXtl.c \
-	src/eXtl_udp.c \
-	src/eXtl_tcp.c \
-	src/eXtl_dtls.c \
-	src/eXtl_tls.c
-
-LOCAL_SRC_FILES += \
-	src/milenage.c \
-	src/rijndael.c 
-
-# BUILD_MAXSIZE: -UMINISIZE
-LOCAL_SRC_FILES += \
-	src/eXsubscription_api.c \
-	src/eXoptions_api.c \
-	src/eXinsubscription_api.c \
-	src/eXpublish_api.c \
-	src/jnotify.c \
-	src/jsubscribe.c \
-	src/inet_ntop.c \
-	src/jpipe.c \
-	src/eXrefer_api.c \
-	src/jpublish.c \
-	src/sdp_offans.c
-#SOCKET_PROGRESS_TIMEOUT=1000  to take care of edge network
-LOCAL_CFLAGS += \
-	-UHAVE_CONFIG_H \
-	-include $(LOCAL_PATH)/../build/exosip/libeXosip2_AndroidConfig.h \
-	-DOSIP_MT \
-	-DENABLE_TRACE \
-	-DSOCKET_TIMEOUT=50 \
-	-DSOCKET_PROGRESS_TIMEOUT=1000 \
-	-include $(LOCAL_PATH)/include/eXosip2/eXosip_transport_hook.h
-
-
-LOCAL_C_INCLUDES += \
-	$(LOCAL_PATH)/include \
-	$(LOCAL_PATH)/../osip/include \
-	$(LOCAL_PATH)/../openssl/include \
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/submodules/externals/build/exosip/libeXosip2_AndroidConfig.h b/submodules/externals/build/exosip/libeXosip2_AndroidConfig.h
deleted file mode 100755
index 8beb75474..000000000
--- a/submodules/externals/build/exosip/libeXosip2_AndroidConfig.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you have the <arpa/nameser.h> header file. */
-#define HAVE_ARPA_NAMESER_H 1
-
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `getifaddrs' function. */
-/* #undef HAVE_GETIFADDRS */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#define HAVE_NETDB_H 1
-
-/* Define to 1 if you have the <openssl/ssl.h> header file. */
-#define HAVE_OPENSSL_SSL_H 1
-
-/* Define if you have POSIX threads libraries and header files. */
-#define HAVE_PTHREAD 1
-
-/* Define to 1 if you have the <resolv8_compat.h> header file. */
-/* #undef HAVE_RESOLV8_COMPAT_H */
-
-/* Define to 1 if you have the <resolv.h> header file. */
-#define HAVE_RESOLV_H 1
-
-/* Define to 1 if you have the <semaphore.h> header file. */
-#define HAVE_SEMAPHORE_H 1
-
-/* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
-/* Define to 1 if you have the <stdarg.h> header file. */
-#define HAVE_STDARG_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sys/sem.h> header file. */
-/* #undef HAVE_SYS_SEM_H */
-
-/* Define to 1 if you have the <sys/signal.h> header file. */
-/* #undef HAVE_SYS_SIGNAL_H */
-
-/* Define to 1 if you have the <sys/soundcard.h> header file. */
-/* #undef HAVE_SYS_SOUNDCARD_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <varargs.h> header file. */
-/* #undef HAVE_VARARGS_H */
-
-/* Name of package */
-#define PACKAGE "libeXosip2"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* Define to the necessary symbol if this constant uses a non-standard name on
-   your system. */
-/* #undef PTHREAD_CREATE_JOINABLE */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "3.1.0"
diff --git a/submodules/externals/build/libantlr3c/Android.mk b/submodules/externals/build/libantlr3c/Android.mk
new file mode 100644
index 000000000..21cd8269c
--- /dev/null
+++ b/submodules/externals/build/libantlr3c/Android.mk
@@ -0,0 +1,39 @@
+
+LOCAL_PATH:= $(call my-dir)/../../libantlr3c/src
+include $(CLEAR_VARS)
+
+LOCAL_MODULE:= libantlr3c
+
+LOCAL_C_INCLUDES += \
+	$(LOCAL_PATH)/../../../externals/libantlr3c/ \
+	$(LOCAL_PATH)/../../../externals/libantlr3c/include \
+
+LOCAL_SRC_FILES := \
+	antlr3baserecognizer.c \
+	antlr3basetree.c \
+	antlr3basetreeadaptor.c \
+	antlr3bitset.c \
+	antlr3collections.c \
+	antlr3commontoken.c \
+	antlr3commontree.c \
+	antlr3commontreeadaptor.c \
+	antlr3commontreenodestream.c \
+	antlr3convertutf.c \
+	antlr3cyclicdfa.c \
+	antlr3debughandlers.c \
+	antlr3encodings.c \
+	antlr3exception.c \
+	antlr3filestream.c \
+	antlr3inputstream.c \
+	antlr3intstream.c \
+	antlr3lexer.c \
+	antlr3parser.c \
+	antlr3rewritestreams.c \
+	antlr3string.c \
+	antlr3stringstream.c \
+	antlr3tokenstream.c \
+	antlr3treeparser.c \
+	antlr3ucs2inputstream.c	
+
+include $(BUILD_STATIC_LIBRARY)
+
diff --git a/submodules/externals/build/libantlr3c/antlr3config.h b/submodules/externals/build/libantlr3c/antlr3config.h
new file mode 100644
index 000000000..4b63a803c
--- /dev/null
+++ b/submodules/externals/build/libantlr3c/antlr3config.h
@@ -0,0 +1,180 @@
+/* antlr3config.h.  Generated from antlr3config.h.in by configure.  */
+/* antlr3config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if ANTLR debugger not required */
+/* #undef ANTLR3_NODEBUGGER */
+
+/* Define if 64 bit mode required */
+/* #undef ANTLR3_USE_64BIT */
+
+/* Define to 1 if you have the `accept' function. */
+/* #undef HAVE_ACCEPT */
+
+/* Define to 1 if you have the <arpa/nameser.h> header file. */
+/* #undef HAVE_ARPA_NAMESER_H */
+
+/* Define to 1 if you have the <ctype.h> header file. */
+/* #undef HAVE_CTYPE_H */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if the system has the type `intptr_t'. */
+/* #undef HAVE_INTPTR_T */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <malloc.h> header file. */
+/* #undef HAVE_MALLOC_H */
+
+/* Define to 1 if you have the `memmove' function. */
+/* #undef HAVE_MEMMOVE */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+/* #undef HAVE_MEMSET */
+
+/* Define to 1 if you have the <netdb.h> header file. */
+/* #undef HAVE_NETDB_H */
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the <netinet/tcp.h> header file. */
+#define HAVE_NETINET_TCP_H 1
+
+/* Define to 1 if you have the <resolv.h> header file. */
+/* #undef HAVE_RESOLV_H */
+
+/* Define to 1 if you have the <socket.h> header file. */
+/* #undef HAVE_SOCKET_H */
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#define HAVE_STDARG_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strdup' function. */
+/* #undef HAVE_STRDUP */
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/malloc.h> header file. */
+/* #undef HAVE_SYS_MALLOC_H */
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if the system has the type `uintptr_t'. */
+/* #undef HAVE_UINTPTR_T */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Name of package */
+#define PACKAGE "libantlr3c"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "jimi@temporal-wave.com"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libantlr3c"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libantlr3c 3.2"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libantlr3c"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "3.2"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "3.2"
+
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+/* #undef _UINT32_T */
+
+/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+/* #undef _UINT64_T */
+
+/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+/* #undef _UINT8_T */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to the type of a signed integer type of width exactly 16 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef int16_t */
+
+/* Define to the type of a signed integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef int32_t */
+
+/* Define to the type of a signed integer type of width exactly 64 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef int64_t */
+
+/* Define to the type of a signed integer type of width exactly 8 bits if such
+   a type exists and the standard includes do not define it. */
+/* #undef int8_t */
+
+/* Define to the type of a signed integer type wide enough to hold a pointer,
+   if such a type exists, and if the system does not define it. */
+/* #undef intptr_t */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Define to the type of an unsigned integer type of width exactly 16 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint16_t */
+
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint32_t */
+
+/* Define to the type of an unsigned integer type of width exactly 64 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint64_t */
+
+/* Define to the type of an unsigned integer type of width exactly 8 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint8_t */
+
+/* Define to the type of an unsigned integer type wide enough to hold a
+   pointer, if such a type exists, and if the system does not define it. */
+/* #undef uintptr_t */
diff --git a/submodules/externals/build/osip/Android.mk b/submodules/externals/build/osip/Android.mk
deleted file mode 100755
index b8bb072a7..000000000
--- a/submodules/externals/build/osip/Android.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-
-LOCAL_PATH:= $(call my-dir)/../../osip
-include $(CLEAR_VARS)
-
-
-libosip2_SRC_FILES = \
-	src/osip2/ict_fsm.c \
-	src/osip2/ist_fsm.c \
-	src/osip2/nict_fsm.c \
-	src/osip2/nist_fsm.c \
-	src/osip2/ict.c \
-	src/osip2/ist.c \
-	src/osip2/nict.c \
-	src/osip2/nist.c \
-	src/osip2/fsm_misc.c \
-	src/osip2/osip.c \
-	src/osip2/osip_transaction.c \
-	src/osip2/osip_event.c \
-	src/osip2/port_fifo.c \
-	src/osip2/osip_dialog.c \
-	src/osip2/osip_time.c \
-	src/osip2/port_sema.c \
-	src/osip2/port_thread.c \
-	src/osip2/port_condv.c
-
-libosipparser2_SRC_FILES = \
-	src/osipparser2/osip_proxy_authorization.c \
-	src/osipparser2/osip_cseq.c \
-	src/osipparser2/osip_record_route.c \
-	src/osipparser2/osip_route.c \
-	src/osipparser2/osip_to.c \
-	src/osipparser2/osip_from.c \
-	src/osipparser2/osip_uri.c \
-	src/osipparser2/osip_authorization.c \
-	src/osipparser2/osip_header.c \
-	src/osipparser2/osip_www_authenticate.c \
-	src/osipparser2/osip_via.c \
-	src/osipparser2/osip_body.c \
-	src/osipparser2/osip_md5c.c \
-	src/osipparser2/osip_message.c \
-	src/osipparser2/osip_list.c \
-	src/osipparser2/osip_call_id.c \
-	src/osipparser2/osip_message_parse.c \
-	src/osipparser2/osip_contact.c \
-	src/osipparser2/osip_message_to_str.c \
-	src/osipparser2/osip_content_length.c \
-	src/osipparser2/osip_parser_cfg.c \
-	src/osipparser2/osip_content_type.c \
-	src/osipparser2/osip_proxy_authenticate.c \
-	src/osipparser2/osip_mime_version.c \
-	src/osipparser2/osip_port.c
-
-# BUILD_MAXSIZE: -UMINISIZE
-libosipparser2_SRC_FILES += \
-	src/osipparser2/osip_accept_encoding.c \
-	src/osipparser2/osip_content_encoding.c \
-	src/osipparser2/osip_authentication_info.c \
-	src/osipparser2/osip_proxy_authentication_info.c \
-	src/osipparser2/osip_accept_language.c \
-	src/osipparser2/osip_accept.c \
-	src/osipparser2/osip_alert_info.c \
-	src/osipparser2/osip_error_info.c \
-	src/osipparser2/osip_allow.c \
-	src/osipparser2/osip_content_disposition.c \
-	src/osipparser2/sdp_accessor.c \
-	src/osipparser2/sdp_message.c \
-	src/osipparser2/osip_call_info.c
-
-LOCAL_SRC_FILES := \
-	$(libosip2_SRC_FILES) \
-	$(libosipparser2_SRC_FILES)
-
-LOCAL_C_INCLUDES += \
-	$(LOCAL_PATH)/include
-
-LOCAL_MODULE:= libosip2
-
-# global flags
-LOCAL_CFLAGS += \
-	-UHAVE_CONFIG_H \
-	-include $(LOCAL_PATH)/../build/osip/libosip2_AndroidConfig.h
-
-# specific flags
-LOCAL_CFLAGS += \
-	-DOSIP_MT \
-	-DHAVE_PTHREAD \
-	-DENABLE_TRACE \
-	-DUSE_GPERF
-
-#LOCAL_LDLIBS += -lpthread
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/submodules/externals/build/osip/libosip2_AndroidConfig.h b/submodules/externals/build/osip/libosip2_AndroidConfig.h
deleted file mode 100755
index b754cebf7..000000000
--- a/submodules/externals/build/osip/libosip2_AndroidConfig.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define to 1 if you have <dict/dict.h> header file */
-/* #undef HAVE_DICT_DICT_H */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Defined if you have lrand48 */
-#define HAVE_LRAND48 
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have POSIX threads libraries and header files. */
-#define HAVE_PTHREAD 1
-
-/* Define to 1 if you have the <semaphore.h> header file. */
-#define HAVE_SEMAPHORE_H 1
-
-/* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
-
-/* Define to 1 if you have the <stdarg.h> header file. */
-#define HAVE_STDARG_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if the system has the type `struct timeval'. */
-#define HAVE_STRUCT_TIMEVAL 1
-
-/* Define to 1 if you have the <syslog.h> header file. */
-#define HAVE_SYSLOG_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sys/sem.h> header file. */
-/* #undef HAVE_SYS_SEM_H */
-
-/* Define to 1 if you have the <sys/signal.h> header file. */
-/* #undef HAVE_SYS_SIGNAL_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/unistd.h> header file. */
-/* #undef HAVE_SYS_UNISTD_H */
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <varargs.h> header file. */
-/* #undef HAVE_VARARGS_H */
-
-/* Name of package */
-#define PACKAGE "libosip2"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* Define to the necessary symbol if this constant uses a non-standard name on
-   your system. */
-/* #undef PTHREAD_CREATE_JOINABLE */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "3.1.0"
diff --git a/submodules/externals/exosip b/submodules/externals/exosip
deleted file mode 160000
index 73097acf6..000000000
--- a/submodules/externals/exosip
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 73097acf6afaef4827e6fe39214e77e53a1fbfd4
diff --git a/submodules/externals/libantlr3c b/submodules/externals/libantlr3c
new file mode 160000
index 000000000..eb738fb40
--- /dev/null
+++ b/submodules/externals/libantlr3c
@@ -0,0 +1 @@
+Subproject commit eb738fb406d2b75e7e94457da800c38d8bfc3c71
diff --git a/submodules/externals/osip b/submodules/externals/osip
deleted file mode 160000
index 7e98a3379..000000000
--- a/submodules/externals/osip
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7e98a3379280307811ed4ad67a95fbf73ba5bbb6
diff --git a/submodules/linphone b/submodules/linphone
index ade529b01..fa4a074f2 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ade529b01ce4d8554635781846c8dc029426b49b
+Subproject commit fa4a074f21c3161ed745003b4f2e3f6ddd0a9d94