diff --git a/README.mingw b/README.mingw
index 07b8735a48bcc10c3fd24296bd7817ac87f5af07..93ba70d46d770779a4640be64a46170dca8d7a39 100644
--- a/README.mingw
+++ b/README.mingw
@@ -14,7 +14,6 @@ In mingw shell, run
 mingw-get install msys-zip
 mingw-get install msys-unzip
 mingw-get install msys-wget
-mingw-get install msys-libopenssl
 
 mkdir -p /opt/perl/bin
 cp /bin/perl /opt/perl/bin/.
@@ -41,13 +40,6 @@ cd /share/themes
 wget http://art.gnome.org/download/themes/gtk2/1122/GTK2-Outcrop.tar.gz
 tar -xvzf GTK2-Outcrop.tar.gz
 
-#Remove the special stdint.h and inttypes.h included in linphone-deps: it is for MSVC only.
-#Mingw will use the one in /mingw/include
-rm /include/stdint.h /include/inttypes.h
-
-#Remove libgcc specific libraries, only needed for MSVC:
-rm /lib/libgcc.a /lib/libmingw32.a /lib/libmingwex.a
-
 #To get the translations working, remove from C:/MinGW/lib :
 libintl.a libintl.la libintl.dll.a
 
diff --git a/build/android/Android.mk b/build/android/Android.mk
index 944f2361196c5e746111fc28e29f959c92fc8792..346b57350c628238bcece6e06d06afa06dd88f21 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -105,15 +105,28 @@ endif
 endif
 
 
+_BUILD_AMR=0
+ifneq ($(BUILD_AMRNB), 0)
+_BUILD_AMR=1
+endif
+
+ifneq ($(BUILD_AMRWB), 0)
+_BUILD_AMR=1
+endif
 
-ifneq ($(BUILD_AMR),0)
+ifneq ($(_BUILD_AMR), 0)
 LOCAL_CFLAGS += -DHAVE_AMR
+LOCAL_STATIC_LIBRARIES += \
+        libmsamr \
+        libopencoreamr
+endif
 
+ifneq ($(BUILD_AMRWB), 0)
 LOCAL_STATIC_LIBRARIES += \
-	libmsamr \
-	libopencoreamr 
+	libvoamrwbenc
 endif
 
+
 ifeq ($(BUILD_SILK),1)
 LOCAL_CFLAGS += -DHAVE_SILK
 LOCAL_STATIC_LIBRARIES += libmssilk
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index d2ef423644933f34a6dd9c8b2059af53b30a5ef4..f045c1a6c76fdbdee982144bd8be891e0df04a8b 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1083,6 +1083,7 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta
 	/*add all payload type for which we don't care about the number */
 	linphone_core_assign_payload_type(lc,&payload_type_ilbc,-1,"mode=30");
 	linphone_core_assign_payload_type(lc,&payload_type_amr,-1,"octet-align=1");
+        linphone_core_assign_payload_type(lc,&payload_type_amrwb,-1,"octet-align=1");
 	linphone_core_assign_payload_type(lc,&payload_type_lpc1015,-1,NULL);
 	linphone_core_assign_payload_type(lc,&payload_type_g726_16,-1,NULL);
 	linphone_core_assign_payload_type(lc,&payload_type_g726_24,-1,NULL);
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 42d5ff8386fe6f653a3f7cd783e379a74949f606..e237b823cdbf48b036bda1f6b96e2b9b71a58f14 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -58,7 +58,7 @@ linphone_LDADD=$(ORTP_LIBS) \
 if BUILD_WIN32
 
 linphone.res:	$(LINPHONE_ICO_RC_FILE) $(LINPHONE_ICO_FILE)
-	windres $(LINPHONE_ICO_RC_FILE) -O coff -o linphone.res
+	windres $(srcdir)/$(LINPHONE_ICO_RC_FILE) -O coff -o linphone.res
 
 linphone_LDADD+=linphone.res -lwininet
 linphone_LDFLAGS=-Wl,--export-all-symbols -mwindows
diff --git a/mediastreamer2 b/mediastreamer2
index 8e3778f1fd61b44124f7303e540b936f9da4560f..fbc201571d8ea4bdc208e87d2f81a109b8ebe060 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 8e3778f1fd61b44124f7303e540b936f9da4560f
+Subproject commit fbc201571d8ea4bdc208e87d2f81a109b8ebe060
diff --git a/oRTP b/oRTP
index a936749fac4d3e2f788a0c03b3c4ea2021b3ae13..92f78b9504915db0220bc6f617f0cd7ad9910771 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit a936749fac4d3e2f788a0c03b3c4ea2021b3ae13
+Subproject commit 92f78b9504915db0220bc6f617f0cd7ad9910771