diff --git a/jni/Android.mk b/jni/Android.mk
index ab967d36b..4f4c1634e 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -41,9 +41,11 @@ ifeq ($(BUILD_UPNP),1)
 include $(linphone-root-dir)/submodules/externals/build/libupnp/Android.mk
 endif
 
-#libxml2
+#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/lpc2xml.mk
 endif
 
 # Speex
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 50f4f0417..3a2b4d868 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 package org.linphone;
 
 import static android.media.AudioManager.MODE_NORMAL;
+import static android.media.AudioManager.MODE_RINGTONE;
 import static android.media.AudioManager.STREAM_RING;
 import static android.media.AudioManager.STREAM_VOICE_CALL;
 import static org.linphone.R.string.pref_codec_amr_key;
@@ -377,7 +378,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		LinphoneAddress lAddress;
 		try {
 			lAddress = mLc.interpretUrl(to);
-			if (mR.getBoolean(R.bool.forbid_self_call) && mLc.isMyself(lAddress.asStringUriOnly())) {
+			LinphoneProxyConfig lpc = mLc.getDefaultProxyConfig();
+
+			if (mR.getBoolean(R.bool.forbid_self_call) && lpc!=null && lAddress.asStringUriOnly().equals(lpc.getIdentity())) {
 				mListenerDispatcher.tryingNewOutgoingCallButWrongDestinationAddress();
 				return;
 			}
@@ -1308,8 +1311,10 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			return;
 		}
 
-		mLc.startRinging();
-
+		if (Hacks.needGalaxySAudioHack()) {
+			mAudioManager.setMode(MODE_RINGTONE);
+		}
+		
 		try {
 			if ((mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE || mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_NORMAL) && mVibrator !=null) {
 				long[] patern = {0,1000,1000};
diff --git a/submodules/linphone b/submodules/linphone
index 0f9f315cb..4da21ea4b 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 0f9f315cbb1ff4af29554cff3c9a20ac99a2f0ba
+Subproject commit 4da21ea4b0e8d1cc4a1005ed446744ead533bd4c