diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 12e80b756..ee846f84b 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -52,6 +52,7 @@
 	
 	<bool name="hash_images_as_name_before_upload">true</bool>
 	
+	<bool name="disable_every_log">false</bool>
 	<bool name="disable_all_security_features_for_markets">false</bool> <!-- Disable TLS/SRTP/ZRTP -->
 	<bool name="disable_all_patented_codecs_for_markets">false</bool> <!-- Disable MPEG4/H264 -->
 	
diff --git a/src/org/linphone/LinphoneLauncherActivity.java b/src/org/linphone/LinphoneLauncherActivity.java
index 20c5d9420..e2ccff25e 100644
--- a/src/org/linphone/LinphoneLauncherActivity.java
+++ b/src/org/linphone/LinphoneLauncherActivity.java
@@ -46,7 +46,7 @@ public class LinphoneLauncherActivity extends Activity {
 		super.onCreate(savedInstanceState);
 		
 		// Used to change for the lifetime of the app the name used to tag the logs
-		new Log(getResources().getString(R.string.app_name));
+		new Log(getResources().getString(R.string.app_name), !getResources().getBoolean(R.bool.disable_every_log));
 		
 		// Hack to avoid to draw twice LinphoneActivity on tablets
         if (getResources().getBoolean(R.bool.isTablet)) {
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 86858044b..d2338e43a 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -417,7 +417,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			copyAssetsFromPackage();
 			//traces alway start with traces enable to not missed first initialization
 			;
-			LinphoneCoreFactory.instance().setDebugMode(getPrefBoolean(R.string.pref_debug_key, false), getString(R.string.app_name));
+			
+			boolean isDebugLogEnabled = !(mR.getBoolean(R.bool.disable_every_log)) && getPrefBoolean(R.string.pref_debug_key, false);
+			LinphoneCoreFactory.instance().setDebugMode(isDebugLogEnabled, getString(R.string.app_name));
 			
 			mLc = LinphoneCoreFactory.instance().createLinphoneCore(
 					this, mLinphoneConfigFile, mLinphoneInitialConfigFile, null);
diff --git a/src/org/linphone/PreferencesFragment.java b/src/org/linphone/PreferencesFragment.java
index 9a13ed4ef..95720c3ad 100644
--- a/src/org/linphone/PreferencesFragment.java
+++ b/src/org/linphone/PreferencesFragment.java
@@ -246,6 +246,10 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa
 				return true;
 			}
 		});
+		
+		if (getResources().getBoolean(R.bool.disable_every_log)) {
+			uncheckDisableAndHideCheckbox(R.string.pref_debug_key);
+		}
 	}
 	
 	private void createAddAccountButton() {
diff --git a/submodules/linphone b/submodules/linphone
index 77ff807ee..8315c4cf1 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 77ff807ee7f2c2a88cf12b8bfc49b3e51edc3cec
+Subproject commit 8315c4cf1fc8e5e2a73a68ee3dee3a85c89e5967