diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 59723d23c..d321c4ded 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -160,8 +160,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		mPref = PreferenceManager.getDefaultSharedPreferences(c);
 		mPowerManager = (PowerManager) c.getSystemService(Context.POWER_SERVICE);
 		mR = c.getResources();
-		TelephonyManager tm = (TelephonyManager) c.getSystemService(Context.TELEPHONY_SERVICE);
-		gsmIdle = tm.getCallState() == TelephonyManager.CALL_STATE_IDLE;
 	}
 	
 	private static final int LINPHONE_VOLUME_STREAM = STREAM_VOICE_CALL;
@@ -274,6 +272,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		instance = new LinphoneManager(c);
 		instance.listenerDispatcher.setServiceListener(listener);
 		instance.startLibLinphone(c);
+		TelephonyManager tm = (TelephonyManager) c.getSystemService(Context.TELEPHONY_SERVICE);
+		boolean gsmIdle = tm.getCallState() == TelephonyManager.CALL_STATE_IDLE;
+		setGsmIdle(gsmIdle);
 		
 		if (Version.isVideoCapable())
 			AndroidVideoApi5JniWrapper.setAndroidSdkVersion(Version.sdk());
@@ -765,7 +766,33 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		listenerDispatcher.onRegistrationStateChanged(state, message);
 	}
 
-	public static boolean gsmIdle;
+	private int savedMaxCallWhileGsmIncall;
+	private synchronized void preventSIPCalls() {
+		if (savedMaxCallWhileGsmIncall != 0) {
+			Log.w("SIP calls are already blocked due to GSM call running");
+			return;
+		}
+		savedMaxCallWhileGsmIncall = mLc.getMaxCalls();
+		mLc.setMaxCalls(0);
+	}
+	private synchronized void allowSIPCalls() {
+		if (savedMaxCallWhileGsmIncall == 0) {
+			Log.w("SIP calls are already allowed as no GSM call knowned to be running");
+			return;
+		}
+		mLc.setMaxCalls(savedMaxCallWhileGsmIncall);
+		savedMaxCallWhileGsmIncall = 0;
+	}
+	public static void setGsmIdle(boolean gsmIdle) {
+		LinphoneManager mThis = instance;
+		if (mThis == null) return;
+		if (gsmIdle) {
+			mThis.allowSIPCalls();
+		} else {
+			mThis.preventSIPCalls();
+		}
+	}
+
 	public void callState(final LinphoneCore lc,final LinphoneCall call, final State state, final String message) {
 		Log.i("new state [",state,"]");
 		if (state == IncomingReceived && !call.equals(lc.getCurrentCall())) {
@@ -777,9 +804,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		}
 
 		if (state == IncomingReceived) {
-			if (!gsmIdle) {
-				mLc.terminateCall(call);
-			}
 			// Brighten screen for at least 10 seconds
 			WakeLock wl = mPowerManager.newWakeLock(
 					PowerManager.ACQUIRE_CAUSES_WAKEUP
diff --git a/src/org/linphone/PhoneStateChangedReceiver.java b/src/org/linphone/PhoneStateChangedReceiver.java
index 7dac13500..00d892118 100644
--- a/src/org/linphone/PhoneStateChangedReceiver.java
+++ b/src/org/linphone/PhoneStateChangedReceiver.java
@@ -40,14 +40,14 @@ public class PhoneStateChangedReceiver extends BroadcastReceiver {
 		final String extraState = intent.getStringExtra(TelephonyManager.EXTRA_STATE);
 
 		if (TelephonyManager.EXTRA_STATE_RINGING.equals(extraState) || TelephonyManager.EXTRA_STATE_OFFHOOK.equals(extraState)) {
-			LinphoneManager.gsmIdle = false;
+			LinphoneManager.setGsmIdle(false);
 			if (!LinphoneManager.isInstanciated()) {
 				Log.i("GSM call state changed but manager not instantiated");
 				return;
 			}
 			LinphoneManager.getLc().pauseAllCalls();
         } else if (TelephonyManager.EXTRA_STATE_IDLE.equals(extraState)) {
-        	LinphoneManager.gsmIdle = true;
+        	LinphoneManager.setGsmIdle(true);
         }
 		
 		 
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index 7c1f6d905..5d9d634db 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -599,4 +599,10 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public boolean soundResourcesLocked() {
 		return soundResourcesLocked(nativePtr);
 	}
+
+	private native void setMaxCalls(long nativePtr, int max);
+	@Override
+	public void setMaxCalls(int max) {
+		setMaxCalls(nativePtr, max);
+	}
 }
diff --git a/submodules/linphone b/submodules/linphone
index ca67884d9..cfaa4721e 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ca67884d934b06a9694325571db1d6569bb48c8f
+Subproject commit cfaa4721e5bea988e585ee221ec88e97b657925d
diff --git a/test/org/linphone/TestConferenceActivity.java b/test/org/linphone/TestConferenceActivity.java
index 24a350bde..246b56053 100644
--- a/test/org/linphone/TestConferenceActivity.java
+++ b/test/org/linphone/TestConferenceActivity.java
@@ -333,6 +333,11 @@ public class TestConferenceActivity extends ConferenceActivity {
 			// TODO Auto-generated method stub
 			return false;
 		}
+		@Override
+		public void setMaxCalls(int max) {
+			// TODO Auto-generated method stub
+			
+		}
 	}