diff --git a/.gitmodules b/.gitmodules
index abf4b679f..c2326bd1c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,7 +15,7 @@
 	url = git://git.linphone.org/libilbc-rfc3951.git
 [submodule "submodules/externals/opencore-amr"]
 	path = submodules/externals/opencore-amr
-	url = git://git.code.sf.net/p/opencore-amr/code
+	url = git://git.linphone.org/opencore-amr
 	ignore = dirty
 [submodule "submodules/msamr"]
 	path = submodules/msamr
@@ -86,5 +86,5 @@
 	url = git://git.linphone.org/linphone-cmake-builder.git
 [submodule "submodules/externals/vo-amrwbenc"]
 	path = submodules/externals/vo-amrwbenc
-	url = git://git.code.sf.net/p/opencore-amr/vo-amrwbenc
+	url = git://git.linphone.org/vo-amrwbenc
 	ignore = dirty
diff --git a/Classes/KIF b/Classes/KIF
index 621d453e3..7cf06309a 160000
--- a/Classes/KIF
+++ b/Classes/KIF
@@ -1 +1 @@
-Subproject commit 621d453e3ae9255894f319c9814d50ae7d676121
+Subproject commit 7cf06309ad1e5b694f1ae6f2f40c0e8d386f7f06
diff --git a/submodules/externals/opencore-amr b/submodules/externals/opencore-amr
deleted file mode 160000
index cf4409e03..000000000
--- a/submodules/externals/opencore-amr
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cf4409e03ec56b1cd85a2f9532f58bc1fa9db274