diff --git a/.gitmodules b/.gitmodules
index 89571ee73..b805414ac 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,9 +34,6 @@
 [submodule "submodules/belr"]
 	path = submodules/belr
 	url = git://git.linphone.org/belr.git
-[submodule "submodules/externals/libmatroska-c"]
-	path = submodules/externals/libmatroska-c
-	url = git://git.linphone.org/libmatroska-c.git
 [submodule "submodules/bctoolbox"]
 	path = submodules/bctoolbox
 	url = git://git.linphone.org/bctoolbox.git
@@ -101,3 +98,6 @@
 [submodule "submodules/mswasapi"]
 	path = submodules/mswasapi
 	url = git://git.linphone.org/mswasapi.git
+[submodule "submodules/bcmatroska2"]
+	path = submodules/bcmatroska2
+	url = git://git.linphone.org/bcmatroska2.git
diff --git a/submodules/bcmatroska2 b/submodules/bcmatroska2
new file mode 160000
index 000000000..bb516d9ae
--- /dev/null
+++ b/submodules/bcmatroska2
@@ -0,0 +1 @@
+Subproject commit bb516d9ae9fd3626a35133fa732666edaf523ded
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index ee98b0c3c..793f13d16 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit ee98b0c3ca8df2a5f87fe2efd3cfe97aa9021d2a
+Subproject commit 793f13d162bbb449c675b691e1774bb34b9a786c
diff --git a/submodules/externals/libmatroska-c b/submodules/externals/libmatroska-c
deleted file mode 160000
index 0c7250913..000000000
--- a/submodules/externals/libmatroska-c
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0c7250913a2f87d4640b64a347918280569f3148
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index 0ee1f589d..4997eef92 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit 0ee1f589d1d63b16861332ec034c200ea487e613
+Subproject commit 4997eef92fdbe17d33935b161c5997090476cc9b
diff --git a/submodules/msamr b/submodules/msamr
index d86b907b3..54b6bab5d 160000
--- a/submodules/msamr
+++ b/submodules/msamr
@@ -1 +1 @@
-Subproject commit d86b907b31eb7ecd6a3fd4409d5c9633d4366164
+Subproject commit 54b6bab5d82bf78bc8345d2d2bad904361131282
diff --git a/submodules/mssilk b/submodules/mssilk
index 3a61f5dec..d52bf6c4d 160000
--- a/submodules/mssilk
+++ b/submodules/mssilk
@@ -1 +1 @@
-Subproject commit 3a61f5decf634f5fb311b2c5f2984525fccd81d9
+Subproject commit d52bf6c4d64de840c0efe7a45c595f7745f97ff9
diff --git a/submodules/mswebrtc b/submodules/mswebrtc
index 8ece6b276..f776bf654 160000
--- a/submodules/mswebrtc
+++ b/submodules/mswebrtc
@@ -1 +1 @@
-Subproject commit 8ece6b276966fdf8414f82bb6f8c381d219867dc
+Subproject commit f776bf6548dfb455ad054bcd846a9c39a6c57f1b