diff --git a/Makefile b/Makefile
index 4f3100c07..ab8cfb326 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,7 @@ endif
 NDK_DEBUG=0
 BUILD_VIDEO=1
 BUILD_OPENH264=1
+BUILD_NON_FREE_CODECS=1
 ENABLE_OPENH264_DECODER=1
 BUILD_UPNP=1
 BUILD_AMRNB=full # 0, light or full
@@ -405,7 +406,7 @@ GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \
 	BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_OPUS=$(BUILD_OPUS) \
 	BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) BUILD_OPENH264=$(BUILD_OPENH264) ENABLE_OPENH264_DECODER=$(ENABLE_OPENH264_DECODER) BUILD_MATROSKA=$(BUILD_MATROSKA) \
 	BUILD_UPNP=$(BUILD_UPNP) BUILD_ZRTP=$(BUILD_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC) BUILD_ILBC=$(BUILD_ILBC) \
-	BUILD_FOR_ARM=$(BUILD_FOR_ARM)
+	BUILD_FOR_ARM=$(BUILD_FOR_ARM) BUILD_NON_FREE_CODECS=$(BUILD_NON_FREE_CODECS)
 
 
 LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \
diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java
index 2b05632e6..dacdf2642 100644
--- a/src/org/linphone/setup/SetupActivity.java
+++ b/src/org/linphone/setup/SetupActivity.java
@@ -223,7 +223,7 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
 			cancel.setEnabled(false);
 		} else {
 			if (mPrefs.isFirstLaunch()) {
-				mPrefs.setEchoCancellation(false);
+				mPrefs.setEchoCancellation(LinphoneManager.getLc().needsEchoCanceler());
 			}
 			success();
 		}		
diff --git a/submodules/linphone b/submodules/linphone
index 88217dcad..db7ba6939 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 88217dcad5f33cd82c8f85300888ab10a0b0dc83
+Subproject commit db7ba6939a4e9ab369e2cc0d3ee7d0690f26b11b