diff --git a/.gitignore b/.gitignore
index 20143b6be..f6721f6f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ project.properties
 tests/*$py.class
 tests/build.xml
 res/.DS_Store
+bc-android.keystore
diff --git a/Makefile b/Makefile
index 44b51a2e1..e32b021ae 100644
--- a/Makefile
+++ b/Makefile
@@ -98,6 +98,7 @@ install-apk: generate-apk
 	ant installd
 
 release: update-project
+	ant clean
 	ant release
 
 run-linphone:
diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java
index c6a83d4b5..db59c252d 100644
--- a/src/org/linphone/setup/SetupActivity.java
+++ b/src/org/linphone/setup/SetupActivity.java
@@ -227,7 +227,10 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
 			
 			boolean isMainAccountLinphoneDotOrg = domain.equals(getString(R.string.default_domain));
 			if (isMainAccountLinphoneDotOrg) {
-				writePreference(R.string.pref_proxy_key, domain + ":5223");
+				if (getResources().getBoolean(R.bool.disable_all_security_features_for_markets))
+					writePreference(R.string.pref_proxy_key, domain + ":5228");
+				else
+					writePreference(R.string.pref_proxy_key, domain + ":5223");
 				writePreference(R.string.pref_enable_outbound_proxy_key, true);
 				writePreference(R.string.pref_stun_server_key, getString(R.string.default_stun));