diff --git a/Android.mk b/jni/Android.mk
similarity index 85%
rename from Android.mk
rename to jni/Android.mk
index be9eb91f6..0c64e525b 100644
--- a/Android.mk
+++ b/jni/Android.mk
@@ -1,4 +1,4 @@
-root-dir:=$(call my-dir)
+root-dir:=$(APP_PROJECT_PATH)
 
 include $(root-dir)/submodules/externals/build/speex/Android.mk
 
@@ -12,7 +12,7 @@ include $(root-dir)/submodules/linphone/oRTP/build/android/Android.mk
 
 include $(root-dir)/submodules/linphone/mediastreamer2/build/android/Android.mk
 
-include $(root-dir)/submodules/msilbc/Android.mk
+#include $(root-dir)/submodules/msilbc/Android.mk
 
 include $(root-dir)/submodules/linphone/build/android/Android.mk
 
diff --git a/Application.mk b/jni/Application.mk
similarity index 80%
rename from Application.mk
rename to jni/Application.mk
index b63251376..e70813aa5 100644
--- a/Application.mk
+++ b/jni/Application.mk
@@ -1,4 +1,4 @@
-APP_PROJECT_PATH := $(call my-dir)/
+APP_PROJECT_PATH := $(call my-dir)/../
 APP_MODULES      :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 liblinphone
 APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk
 APP_PLATFORM := android-3
diff --git a/libs/armeabi/liblinphone.so b/libs/armeabi/liblinphone.so
index 1f0f75c0a..6514cc7ec 100755
Binary files a/libs/armeabi/liblinphone.so and b/libs/armeabi/liblinphone.so differ