diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 42485d158..6b6830645 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.linphone"
-      android:versionCode="1104" android:versionName="1.1.4"  android:installLocation="auto"> 
+      android:versionCode="1105" android:versionName="1.1.5"  android:installLocation="auto"> 
     <uses-sdk android:minSdkVersion="3" />
 
 
diff --git a/jni/Android.mk b/jni/Android.mk
index 37d052a69..0331fe615 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,7 +1,6 @@
 root-dir:=$(APP_PROJECT_PATH)
-
+#default values
 BUILD_AMR=light
-
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 BUILD_X264=1
 LINPHONE_VIDEO=1
@@ -9,6 +8,7 @@ else
 BUILD_X264=0
 endif
 
+
 include $(root-dir)/submodules/externals/build/speex/Android.mk
 
 include $(root-dir)/submodules/externals/build/gsm/Android.mk
diff --git a/jni/Application.mk b/jni/Application.mk
index ec6c942d2..627f0b9a4 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -2,20 +2,30 @@ APP_PROJECT_PATH := $(call my-dir)/../
 APP_MODULES      :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2  liblinphone
 #APP_STL := stlport_static
 
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+APP_MODULES      +=libmsilbc 
+endif
+
+ifneq ($(LINPHONE_VIDEO),0)
+APP_MODULES += libavutil libavcore libavcodec libswscale
+endif
+
+ifneq ($(BUILD_AMR),0)
 APP_MODULES += libopencoreamr libmsamr
+endif
 
 ifeq ($(WITH_OPENSSL),1)
 APP_MODULES += libcrypto libssl
 endif
 
+ifneq ($(BUILD_X264),0)
+APP_MODULES +=libx264 libmsx264
+endif
 
 ifeq ($(RING),yes)
 APP_MODULES      += libring
 endif
 
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-APP_MODULES      +=libmsilbc libavutil libavcore libavcodec libswscale libx264 libmsx264
-endif
 APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk
 APP_PLATFORM := android-8
 APP_ABI := armeabi armeabi-v7a
diff --git a/submodules/linphone b/submodules/linphone
index c8f4f8f29..999e7c141 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit c8f4f8f296baa01f5839104327f1707626b7cf63
+Subproject commit 999e7c141076fea1ed2ddc2444273ef37c426096