diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index eb2a58f935d0a4d493715bb346d793417236734e..4f1d367c5f3470ca4b3ef1cdb076bf3837851108 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1031,6 +1031,7 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta
 	linphone_core_assign_payload_type(&payload_type_speex_uwb,112,"vbr=on");
 	linphone_core_assign_payload_type(&payload_type_telephone_event,101,"0-11");
 	linphone_core_assign_payload_type(&payload_type_ilbc,113,"mode=30");
+	linphone_core_assign_payload_type(&payload_type_amr,114,"octet-align=1");
 
 #ifdef ENABLE_NONSTANDARD_GSM
 	{
diff --git a/mediastreamer2 b/mediastreamer2
index 0ca839b53751c4b687535bcfae747273f3dd0c44..b340a76e998c7dd2670372212b0bf14d7c59b987 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0ca839b53751c4b687535bcfae747273f3dd0c44
+Subproject commit b340a76e998c7dd2670372212b0bf14d7c59b987