diff --git a/jni/Android.mk b/jni/Android.mk
index 4f4c1634e..f024c1ed9 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -44,7 +44,7 @@ endif
 #libxml2 + xml2lpc + lpc2xml
 ifeq ($(BUILD_REMOTE_PROVISIONING),1)
 include $(linphone-root-dir)/submodules/externals/build/libxml2/Android.mk
-include $(linphone-root-dir)/submodules/linphone/build/android/xml2lpc.mk
+#include $(linphone-root-dir)/submodules/linphone/build/android/xml2lpc.mk
 include $(linphone-root-dir)/submodules/linphone/build/android/lpc2xml.mk
 endif
 
diff --git a/jni/Application.mk b/jni/Application.mk
index 9f424dcca..b7949d095 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -13,7 +13,7 @@ endif
 
 #remote provisioning
 ifeq ($(BUILD_REMOTE_PROVISIONING),1)
-APP_MODULES += libxml2 libxml2lpc liblpc2xml
+APP_MODULES += libxml2 
 endif
 
 #default values
diff --git a/submodules/externals/build/libxml2/Android.mk b/submodules/externals/build/libxml2/Android.mk
index cb8329c97..a72bd3b0e 100644
--- a/submodules/externals/build/libxml2/Android.mk
+++ b/submodules/externals/build/libxml2/Android.mk
@@ -65,5 +65,5 @@ LOCAL_SHARED_LIBRARIES += $(common_SHARED_LIBRARIES)
 
 LOCAL_MODULE:= libxml2
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
 
diff --git a/submodules/linphone b/submodules/linphone
index 2f3f40590..b90e57d4c 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 2f3f4059060f04ae2ca3b59551668b6c2dc0f32d
+Subproject commit b90e57d4c84517eebbcf077b79fc70415aa5c684