diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 165974e77..24d43333e 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -725,6 +725,7 @@ static void sip_config_read(LinphoneCore *lc)
 		LinphoneProxyConfig *cfg=linphone_proxy_config_new_from_config_file(lc,i);
 		if (cfg!=NULL){
 			linphone_core_add_proxy_config(lc,cfg);
+			linphone_proxy_config_unref(cfg);
 		}else{
 			break;
 		}
@@ -2166,7 +2167,7 @@ static void proxy_update(LinphoneCore *lc){
 			lc->sip_conf.deleted_proxies =ms_list_remove_link(lc->sip_conf.deleted_proxies,elem);
 			ms_message("Proxy config for [%s] is definitely removed from core.",linphone_proxy_config_get_addr(cfg));
 			_linphone_proxy_config_release_ops(cfg);
-			linphone_proxy_config_destroy(cfg);
+			linphone_proxy_config_unref(cfg);
 		}
 	}
 }
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index c96544e8b..b32d76d17 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -1137,7 +1137,7 @@ int linphone_core_add_proxy_config(LinphoneCore *lc, LinphoneProxyConfig *cfg){
 		ms_warning("ProxyConfig already entered, ignored.");
 		return 0;
 	}
-	lc->sip_conf.proxies=ms_list_append(lc->sip_conf.proxies,(void *)cfg);
+	lc->sip_conf.proxies=ms_list_append(lc->sip_conf.proxies,(void *)linphone_proxy_config_ref(cfg));
 	linphone_proxy_config_apply(cfg,lc);
 	return 0;
 }
diff --git a/mediastreamer2 b/mediastreamer2
index a003a1cc3..90c0ea293 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit a003a1cc349530dfffa937e16cb06a0c8b4632c8
+Subproject commit 90c0ea293a934b3b23a3c6b70f8abe5db545a3d5