diff --git a/Makefile b/Makefile
index 93ec52b39..1e0f0b911 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+
 NDK_PATH=$(shell dirname `which ndk-build`)
 SDK_PATH=$(shell dirname `which android`)
 SDK_PLATFORM_TOOLS_PATH=$(shell dirname `which adb`)
@@ -62,6 +63,10 @@ BUILD_SQLITE=1
 BUILD_CONTACT_HEADER=0
 BUILD_RTP_MAP=0
 BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=0
+LIBLINPHONE_EXTENDED_SRC_FILES=
+LIBLINPHONE_EXTENDED_C_INCLUDES=
+LIBLINPHONE_EXTENDED_CFLAGS=
+APP_STL=stlport_static
 
 # Checks
 CHECK_MSG=$(shell ./check_tools.sh)
@@ -340,10 +345,15 @@ GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \
 	BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) \
 	BUILD_UPNP=$(BUILD_UPNP) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC)
 
+
 LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \
 	LINPHONE_VERSION=$(LINPHONE_VERSION) BELLESIP_VERSION=$(BELLESIP_VERSION) USE_JAVAH=$(USE_JAVAH) \
 	BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_TLS=$(BUILD_TLS) BUILD_SQLITE=$(BUILD_SQLITE) \
 	BUILD_CONTACT_HEADER=$(BUILD_CONTACT_HEADER) BUILD_RTP_MAP=$(BUILD_RTP_MAP) \
+	LIBLINPHONE_EXTENDED_SRC_FILES="$(LIBLINPHONE_EXTENDED_SRC_FILES)" \
+	LIBLINPHONE_EXTENDED_C_INCLUDES="$(LIBLINPHONE_EXTENDED_C_INCLUDES)" \
+	LIBLINPHONE_EXTENDED_CFLAGS="$(LIBLINPHONE_EXTENDED_CFLAGS)" \
+	APP_STL="$(APP_STL)" \
 	BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=$(BUILD_DONT_CHECK_HEADERS_IN_MESSAGE)
 
 MEDIASTREAMER2_OPTIONS = $(GENERATE_OPTIONS) BUILD_MEDIASTREAMER2_SDK=1
diff --git a/jni/Android.mk b/jni/Android.mk
index 60f60f0c2..e1212dce4 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -58,7 +58,6 @@ include $(linphone-root-dir)/submodules/belle-sip/build/android/Android.mk
 endif
 
 
-
 include $(linphone-root-dir)/submodules/linphone/oRTP/build/android/Android.mk
 
 include $(linphone-root-dir)/submodules/linphone/mediastreamer2/build/android/Android.mk
diff --git a/jni/Application.mk b/jni/Application.mk
index 6a4e216ac..09e00e4c2 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,5 +1,5 @@
 APP_PROJECT_PATH := $(call my-dir)/../
-APP_STL := stlport_static
+NDK_TOOLCHAIN_VERSION := 4.8
 
 ifeq ($(BUILD_MEDIASTREAMER2_SDK),)
 BUILD_MEDIASTREAMER2_SDK=0