diff --git a/custom_rules.xml b/custom_rules.xml
index a2c77ff6a..ae628ecd4 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -36,6 +36,7 @@
 			<class name="org.linphone.core.PresencePersonImpl" />
 			<class name="org.linphone.core.PresenceServiceImpl" />
 			<class name="org.linphone.core.ErrorInfoImpl" />
+			<class name="org.linphone.core.TunnelConfigImpl" />
 		</javah>
 		<javah outputfile="gen/xml2lpc_jni.h">
 			<classpath>
diff --git a/src/org/linphone/CallManager.java b/src/org/linphone/CallManager.java
index 319b238fa..189c25297 100644
--- a/src/org/linphone/CallManager.java
+++ b/src/org/linphone/CallManager.java
@@ -52,7 +52,7 @@ public class CallManager {
 	public void inviteAddress(LinphoneAddress lAddress, boolean videoEnabled, boolean lowBandwidth) throws LinphoneCoreException {
 		LinphoneCore lc = LinphoneManager.getLc();
 		
-		LinphoneCallParams params = lc.createDefaultCallParameters();
+		LinphoneCallParams params = lc.createCallParams(null);
 		bm().updateWithProfileSettings(lc, params);
 
 		if (videoEnabled && params.getVideoEnabled()) {
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index 713c009d0..9eb0868b4 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -168,7 +168,7 @@ public class IncomingCallActivity extends Activity implements LinphoneSliderTrig
 	}
 	
 	private void answer() {
-		LinphoneCallParams params = LinphoneManager.getLc().createDefaultCallParameters();
+		LinphoneCallParams params = LinphoneManager.getLc().createCallParams(mCall);
 		
 		boolean isLowBandwidthConnection = !LinphoneUtils.isHighBandwidthConnection(this);
 		if (isLowBandwidthConnection) {
diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index a627312a1..f67b34fb4 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -1090,8 +1090,7 @@ public class LinphonePreferences {
 				if(servers.length > 0) {
 					tunnelConfig = servers[0];
 				} else {
-					tunnelConfig = new TunnelConfig();
-					tunnelConfig.setDelay(500);
+					tunnelConfig = LinphoneCoreFactory.instance().createTunnelConfig();
 				}
 			}
 			return tunnelConfig;
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 611b6c3b1..91ea725eb 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 611b6c3b1d237dc9fa4113c39c2f5f070235b783
+Subproject commit 91ea725ebd9ce931de6356235bf1b500aeaa86fa
diff --git a/submodules/linphone b/submodules/linphone
index 847f56bb4..c4cf58931 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 847f56bb4c91032c44335df53fb10bdb1001f8d6
+Subproject commit c4cf58931e7db458c5f2f9775f2bdb7a6d1b9f67