diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 56bd7c62a..75cc94f38 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -433,10 +433,10 @@ static void sound_config_read(LinphoneCore *lc)
 	linphone_core_set_play_file(lc,lp_config_get_string(lc->config,"sound","hold_music",PACKAGE_SOUND_DIR "/" HOLD_MUSIC));
 	check_sound_device(lc);
 	lc->sound_conf.latency=0;
-#if !defined(TARGET_OS_IPHONE) && !defined(ANDROID)
+#ifndef __ios 
     tmp=TRUE;
 #else
-    tmp=FALSE;
+    tmp=FALSE; /* on iOS we have builtin echo cancellation.*/
 #endif
     tmp=lp_config_get_int(lc->config,"sound","echocancellation",tmp);
 	linphone_core_enable_echo_cancellation(lc,tmp);
diff --git a/mediastreamer2 b/mediastreamer2
index 188a73630..5429d344a 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 188a736305a526b34daf454f6f6581fce38ea589
+Subproject commit 5429d344adf0775fa70e2696bff3f54057191143
diff --git a/oRTP b/oRTP
index 443580aab..c51e20cc0 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 443580aabf873e1b30b39909d38ddaecf6ec0871
+Subproject commit c51e20cc0c34db562754b5b7fe9be3bada83cd26