diff --git a/.gitmodules b/.gitmodules
index ccf14f7ba..bfd0edac3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,3 +28,6 @@
 [submodule "submodules/externals/x264"]
 	path = submodules/externals/x264
 	url = git://git.videolan.org/x264.git
+[submodule "submodules/msx264"]
+	path = submodules/msx264
+	url = git://git.linphone.org/msx264.git
diff --git a/jni/Android.mk b/jni/Android.mk
index 8c4ef8067..477bb04af 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -18,8 +18,10 @@ include $(root-dir)/submodules/linphone/mediastreamer2/build/android/Android.mk
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 include $(root-dir)/submodules/msilbc/Android.mk
+include $(root-dir)/submodules/msx264/Android.mk
 include $(root-dir)/submodules/externals/build/ffmpeg/Android.mk
 include $(root-dir)/submodules/externals/build/x264/Android.mk
+
 endif
 
 include $(root-dir)/submodules/linphone/build/android/Android.mk
diff --git a/jni/Application.mk b/jni/Application.mk
index d78f951ee..0b1d358e1 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -3,7 +3,7 @@ APP_MODULES      :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2
 
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-APP_MODULES      +=libmsilbc libavutil libavcore libavcodec libswscale libx264
+APP_MODULES      +=libmsilbc libavutil libavcore libavcodec libswscale libx264 libmsx264
 endif
 APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk
 APP_PLATFORM := android-8
diff --git a/submodules/externals/build/x264/config.h b/submodules/externals/build/x264/config.h
index df6cd338a..9e532298c 100644
--- a/submodules/externals/build/x264/config.h
+++ b/submodules/externals/build/x264/config.h
@@ -4,7 +4,7 @@
 #define HAVE_NEON 1
 #define ARCH_ARM 1
 #define SYS_LINUX 1
-#define HAVE_LOG2F 1
+#define HAVE_LOG2F 0
 #define fseek fseeko
 #define ftell ftello
 #define BIT_DEPTH 8
diff --git a/submodules/linphone b/submodules/linphone
index 7107aa1d1..5cdf29100 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 7107aa1d1d7a5eaa3fbee6a7bae5766a5bc7bda6
+Subproject commit 5cdf291009aa0481259b99ff15c62d0c178d5e36
diff --git a/submodules/msx264 b/submodules/msx264
new file mode 160000
index 000000000..e9852e6e8
--- /dev/null
+++ b/submodules/msx264
@@ -0,0 +1 @@
+Subproject commit e9852e6e87809242ad126fc776fa1373673ab7f2