diff --git a/.gitmodules b/.gitmodules
index 5807a21e6..9b8a46ff1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,6 +16,7 @@
 [submodule "submodules/externals/opencore-amr"]
 	path = submodules/externals/opencore-amr
 	url = git://git.code.sf.net/p/opencore-amr/code
+	ignore = dirty
 [submodule "submodules/msamr"]
 	path = submodules/msamr
 	url = git://git.linphone.org/msamr.git
diff --git a/submodules/build/builders.d/opencore-amr.mk b/submodules/build/builders.d/opencore-amr.mk
index 2c68920fa..ba415c7ed 100644
--- a/submodules/build/builders.d/opencore-amr.mk
+++ b/submodules/build/builders.d/opencore-amr.mk
@@ -22,10 +22,13 @@
 
 opencore-amr_dir?=externals/opencore-amr
 
-$(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure: $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure.ac
-	cd $(BUILDER_SRC_DIR)/$(opencore-amr_dir) && autoreconf
+$(BUILDER_SRC_DIR)/$(opencore-amr_dir)/autoreconf.stamp: $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure.ac
+	cd $(BUILDER_SRC_DIR)/$(opencore-amr_dir) \
+	&& libtoolize --copy --force \
+	&& aclocal -I m4 \
+	&& automake --add-missing --force-missing --copy && autoreconf && touch autoreconf.stamp
 
-$(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile: $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure
+$(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile: $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/autoreconf.stamp
 	mkdir -p $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)
 	cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/ \
 	&& CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
diff --git a/submodules/externals/srtp b/submodules/externals/srtp
index ca0b6a340..4338c102f 160000
--- a/submodules/externals/srtp
+++ b/submodules/externals/srtp
@@ -1 +1 @@
-Subproject commit ca0b6a3402fed819bbffd4375df7ded209c9d39f
+Subproject commit 4338c102f5a4b8f89b7019ed66fb456e3e3359ae
diff --git a/submodules/linphone b/submodules/linphone
index 3a9b9dd29..7e32b85fa 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 3a9b9dd29c08147b5c2292c0e988f45840588070
+Subproject commit 7e32b85fa2a1ffc80433974c4ea66910a53c246e