diff --git a/jni/Android.mk b/jni/Android.mk
index 2a6fd7472..45268eda7 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -19,7 +19,7 @@ LINPHONE_VIDEO=0
 BUILD_X264=0
 endif
 
-include $(linphone-root-dir)/submodules/linphone/mediastreamer2/jni/libneon/Android.mk
+include $(linphone-root-dir)/submodules/linphone/mediastreamer2/src/android/libneon/Android.mk
 
 ##ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 ifeq ($(BUILD_GPLV3_ZRTP), 1)
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 525a4ffb7..6b058ba83 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 525a4ffb798c5cc2ef137af52d1255de9ef95fbf
+Subproject commit 6b058ba830644578da70c9bb85a41acdb06c03dd
diff --git a/submodules/linphone b/submodules/linphone
index d44378253..9d3f8f7d9 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit d44378253138ee5be1146c3da1b1c0dc20625b2f
+Subproject commit 9d3f8f7d94080f4dd293bca53b4bcf9afac88d78