diff --git a/src/android/org/linphone/LinphonePreferences.java b/src/android/org/linphone/LinphonePreferences.java
index d5541003b..dec8d3f5a 100644
--- a/src/android/org/linphone/LinphonePreferences.java
+++ b/src/android/org/linphone/LinphonePreferences.java
@@ -560,6 +560,7 @@ public class LinphonePreferences {
 			ProxyConfig prxCfg = getProxyConfig(n);
 			prxCfg.edit();
 			prxCfg.getNatPolicy().enableIce(ice);
+			prxCfg.getNatPolicy().enableStun(ice);
 			prxCfg.done();
 		} catch (Exception e) {
 			Log.e(e);
@@ -577,7 +578,6 @@ public class LinphonePreferences {
 			prxCfg.edit();
 			NatPolicy np = prxCfg.getNatPolicy();
 			np.setStunServer(stun);
-			np.enableStun(stun!=null);
 			prxCfg.done();
 		} catch (Exception e) {
 			Log.e(e);
@@ -1041,7 +1041,6 @@ public class LinphonePreferences {
 		nat.setStunServer(stun);
 
 		if (stun != null && !stun.isEmpty()) {
-			nat.enableStun(true);
 		}
 		getLc().setNatPolicy(nat);
 	}
@@ -1049,6 +1048,7 @@ public class LinphonePreferences {
 	public void setIceEnabled(boolean enabled) {
 		NatPolicy nat = getOrCreateNatPolicy();
 		nat.enableIce(enabled);
+		nat.enableStun(enabled);
 		getLc().setNatPolicy(nat);
 	}
 
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 7aeebbb83..c805efcad 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 7aeebbb8387bb8de943caded23cd23bb78b6a58b
+Subproject commit c805efcad8a0bb1c9aa39293aa20731a925e5a00
diff --git a/submodules/linphone b/submodules/linphone
index 1ad9a0789..67b6f7193 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 1ad9a0789fb6fd80177c043d012bd8acaf7eb01a
+Subproject commit 67b6f7193926191907498c41bebb507f1302dca6