diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 37a1079a3..273990742 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -1710,6 +1710,13 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
 		else if (strcasecmp(type,"full")==0)
 			audio_stream_enable_echo_limiter(audiostream,ELControlFull);
 	}
+
+	/* equalizer location in the graph: 'mic' = in input graph, otherwise in output graph.
+		Any other value than mic will default to output graph for compatibility */
+	const char *location = lp_config_get_string(lc->config,"sound","eq_location","hp");
+	audiostream->eq_loc = (strcasecmp(location,"mic") == 0) ? MSEqualizerMic : MSEqualizerHP;
+	ms_error("Equalizer location: %s", location);
+
 	audio_stream_enable_gain_control(audiostream,TRUE);
 	if (linphone_core_echo_cancellation_enabled(lc)){
 		int len,delay,framesize;
diff --git a/mediastreamer2 b/mediastreamer2
index a1c7195ff..b1b9fc244 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a1c7195ff8372ac1b77d71dce52c2d9da0173cc6
+Subproject commit b1b9fc244915ecccbba26db9440b077d5cafa85f