diff --git a/.gitmodules b/.gitmodules
index 53d5b7712..fc308b280 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,12 +7,6 @@
 [submodule "submodules/externals/speex"]
 	path = submodules/externals/speex
 	url = git://git.linphone.org/speex.git
-[submodule "submodules/msilbc"]
-	path = submodules/msilbc
-	url = git://git.linphone.org/msilbc.git
-[submodule "submodules/libilbc-rfc3951"]
-	path = submodules/libilbc-rfc3951
-	url = git://git.linphone.org/libilbc-rfc3951.git
 [submodule "submodules/externals/ffmpeg"]
 	path = submodules/externals/ffmpeg
 	url = git://git.linphone.org/ffmpeg.git
diff --git a/Makefile b/Makefile
index 142822082..2b3e0f828 100644
--- a/Makefile
+++ b/Makefile
@@ -130,25 +130,6 @@ endif
 
 install: install-apk run-linphone
 
-#libilbc
-LIBILBC_SRC_DIR=$(TOPDIR)/submodules/libilbc-rfc3951
-LIBILBC_BUILD_DIR=$(LIBILBC_SRC_DIR)
-$(LIBILBC_SRC_DIR)/configure:
-	cd $(LIBILBC_SRC_DIR) && ./autogen.sh
-
-$(LIBILBC_BUILD_DIR)/Makefile: $(LIBILBC_SRC_DIR)/configure
-	cd $(LIBILBC_BUILD_DIR) && \
-	./configure \
-
-$(LIBILBC_BUILD_DIR)/src/iLBC_decode.c: $(LIBILBC_BUILD_DIR)/Makefile
-	cd $(LIBILBC_BUILD_DIR)/downloads && make \
-	|| ( echo "iLBC prepare stage failed" ; exit 1 )
-
-ifeq ($(BUILD_ILBC),1)
-prepare-ilbc: $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c
-else
-prepare-ilbc:
-endif
 
 #ffmpeg
 ifeq ($(BUILD_VIDEO),1)
@@ -430,7 +411,7 @@ $(MATROSKA_SRC_DIR)/patch_applied.txt: $(MATROSKA_BUILD_DIR)/fix_libmatroska2.pa
 	cd $(MATROSKA_SRC_DIR);	patch -p1 < $<; touch $@
 
 #Build targets
-prepare-sources: build-ffmpeg build-x264 build-openh264 prepare-ilbc build-vpx prepare-srtp prepare-mediastreamer2 prepare-antlr3 prepare-belle-sip $(TOPDIR)/res/raw/rootca.pem prepare-matroska2 prepare-codec2
+prepare-sources: build-ffmpeg build-x264 build-openh264 build-vpx prepare-srtp prepare-mediastreamer2 prepare-antlr3 prepare-belle-sip $(TOPDIR)/res/raw/rootca.pem prepare-matroska2 prepare-codec2
 
 GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \
 	BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_OPUS=$(BUILD_OPUS) BUILD_CODEC2=$(BUILD_CODEC2)\
diff --git a/jni/Android.mk b/jni/Android.mk
index 30cf57f03..1f0fd4400 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -82,10 +82,6 @@ endif
 include $(linphone-root-dir)/submodules/mssilk/Android.mk
 endif
 
-ifeq ($(BUILD_ILBC), 1)
-include $(linphone-root-dir)/submodules/msilbc/Android.mk
-endif
-
 ifeq ($(BUILD_CODEC2), 1)
 include $(linphone-root-dir)/submodules/mscodec2/Android.mk
 include $(linphone-root-dir)/submodules/externals/build/codec2/Android.mk
@@ -179,13 +175,14 @@ $(info $(TARGET_ARCH_ABI): Build NEON modules for ISAC)
 WEBRTC_BUILD_NEON_LIBS=true
 endif
 
-$(info $(TARGET_ARCH_ABI): Build iSAC plugin for mediastreamer2)
+$(info $(TARGET_ARCH_ABI): Build iSAC and ilbc plugin for mediastreamer2)
 include $(linphone-root-dir)/submodules/mswebrtc/build/android/modules/audio_coding/codecs/isac/fix/source/Android.mk
+include $(linphone-root-dir)/submodules/mswebrtc/build/android/modules/audio_coding/codecs/ilbc/Android.mk
 endif
 
 # common modules for ISAC and AECM
-ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC),00)
-$(info $(TARGET_ARCH_ABI): Build common modules for iSAC and AECM ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC)))
+ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC)$(BUILD_ILBC),000)
+$(info $(TARGET_ARCH_ABI): Build common modules for iSAC, ilbc and AECM ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC)))
 include $(linphone-root-dir)/submodules/mswebrtc/build/android/common_audio/signal_processing/Android.mk
 include $(linphone-root-dir)/submodules/mswebrtc/Android.mk
 endif
diff --git a/jni/Application.mk b/jni/Application.mk
index ab32cd6d1..ff48ad149 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -103,6 +103,13 @@ ifneq ($(BUILD_OPUS), 0)
 APP_MODULES += libopus
 endif
 
+ifeq ($(BUILD_ILBC), 1)
+APP_MODULES += libwebrtc_spl libwebrtc_ilbc libmswebrtc
+ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI)))
+APP_MODULES += libwebrtc_spl_neon
+endif
+endif
+
 ifneq ($(BUILD_WEBRTC_AECM), 0)
 APP_MODULES += libwebrtc_system_wrappers libwebrtc_spl libwebrtc_apm_utility libwebrtc_aecm libmswebrtc
 ifneq (,$(findstring armeabi,$(TARGET_ARCH_ABI)))
@@ -135,10 +142,6 @@ ifeq ($(BUILD_CODEC2), 1)
 APP_MODULES      +=libcodec2 libmscodec2
 endif
 
-ifeq ($(BUILD_ILBC), 1)
-APP_MODULES      +=libmsilbc
-endif
-
 ifeq ($(BUILD_SRTP), 1)
 APP_MODULES      += libsrtp
 endif
diff --git a/submodules/bcg729 b/submodules/bcg729
index 31a89d7d9..e540e0c4d 160000
--- a/submodules/bcg729
+++ b/submodules/bcg729
@@ -1 +1 @@
-Subproject commit 31a89d7d951200f6c86f800ca017184700bd0917
+Subproject commit e540e0c4d5521c5125e1de496ad1085e642df120
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 77d350a94..39a660c07 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 77d350a949ad073de0718ab60b86c74930517f1b
+Subproject commit 39a660c07feaaaae0eca8e1d8c18d52adb8e7cf3
diff --git a/submodules/linphone b/submodules/linphone
index 933748ee9..1980323a8 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 933748ee9becf3186776f9d1cb69a00e92dc2905
+Subproject commit 1980323a8e37224a71045e2ff12ecb8cd8e9ef72
diff --git a/submodules/msamr b/submodules/msamr
index 61ab5cb11..5e180193d 160000
--- a/submodules/msamr
+++ b/submodules/msamr
@@ -1 +1 @@
-Subproject commit 61ab5cb11a63a5f8e10cced9d481979718199954
+Subproject commit 5e180193d06e5d6b3394571ac7750b5359856c15
diff --git a/submodules/mscodec2 b/submodules/mscodec2
index 64df6cb53..8971bd1a2 160000
--- a/submodules/mscodec2
+++ b/submodules/mscodec2
@@ -1 +1 @@
-Subproject commit 64df6cb53ceacdea74a021e83f664e9aaa140ef8
+Subproject commit 8971bd1a232ad541153bca0044cc43fad6272612
diff --git a/submodules/msopenh264 b/submodules/msopenh264
index 9be271700..709e1f690 160000
--- a/submodules/msopenh264
+++ b/submodules/msopenh264
@@ -1 +1 @@
-Subproject commit 9be271700b377a251b95e9d8dbe0e8b878a403ac
+Subproject commit 709e1f6903914fa883ebcf26f51fece65e3e1ab5
diff --git a/submodules/mssilk b/submodules/mssilk
index 2af360002..e766ae43c 160000
--- a/submodules/mssilk
+++ b/submodules/mssilk
@@ -1 +1 @@
-Subproject commit 2af360002ccf2a0e30c48aec9498b2bfd23fcd2c
+Subproject commit e766ae43c503aa08080df9beb24a0fe81ce213bb
diff --git a/submodules/mswebrtc b/submodules/mswebrtc
index 148373c31..122f55421 160000
--- a/submodules/mswebrtc
+++ b/submodules/mswebrtc
@@ -1 +1 @@
-Subproject commit 148373c315a78bbadbe57997bf316f03c561ded2
+Subproject commit 122f55421b02f063817638b8650032eb056995a3
diff --git a/submodules/msx264 b/submodules/msx264
index 58941c15d..427e20aea 160000
--- a/submodules/msx264
+++ b/submodules/msx264
@@ -1 +1 @@
-Subproject commit 58941c15dcf23d6b47cdc557b399dc6e7ce2b0b5
+Subproject commit 427e20aeabcf62fbd2fdb48ab80f56833d3db790