diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..83bec1ac8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+libs
+obj
+gen
+bin
+doc
diff --git a/libs/armeabi-v7a/liblinphone.so b/libs/armeabi-v7a/liblinphone.so
deleted file mode 100755
index dc9c1441a..000000000
Binary files a/libs/armeabi-v7a/liblinphone.so and /dev/null differ
diff --git a/libs/armeabi/liblinphone.so b/libs/armeabi/liblinphone.so
deleted file mode 100755
index 63be2ef8a..000000000
Binary files a/libs/armeabi/liblinphone.so and /dev/null differ
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 1c6280522..3102c6272 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -509,23 +509,30 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	private void setSignalingTransportsFromConfiguration(Transports t) {
 		Transports ports = new Transports(t);
 		boolean useStandardPort = getBool(R.string.pref_transport_use_standard_ports_key, false);
-
-		if (!getBool(R.string.pref_transport_udp_key, false)) {
-			ports.udp = 0;
-		} else if (useStandardPort) {
-			ports.udp = 5060;
-		}
+		int lPreviousPort = ports.tcp +ports.udp +ports.tls; // assume only one port is active 
 		
 		if (!getBool(R.string.pref_transport_tcp_key, false)) {
 			ports.tcp = 0;
 		} else if (useStandardPort) {
 			ports.tcp = 5060;
+		} else if (ports.tcp==0){
+			ports.tcp=lPreviousPort;
+		}
+
+		if (!getBool(R.string.pref_transport_udp_key, false)) {
+			ports.udp = 0;
+		} else if (useStandardPort) {
+			ports.udp = 5060;
+		} else if (ports.udp==0) {
+			ports.udp = lPreviousPort;
 		}
 
 		if (!getBool(R.string.pref_transport_tls_key, false)) {
 			ports.tls = 0;
 		} else if (useStandardPort) {
 			ports.tls = 5060;
+		} else if (ports.tls==0) {
+			ports.tls=lPreviousPort;
 		}
 
 		mLc.setSignalingTransportPorts(ports);