diff --git a/.gitmodules b/.gitmodules
index 36c92cb5b..55cee76e4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -69,10 +69,6 @@
 	path = submodules/externals/openh264
 	url = https://github.com/cisco/openh264
 	ignore = dirty
-[submodule "submodules/externals/libmatroska-c"]
-	path = submodules/externals/libmatroska-c
-	url = git://git.linphone.org/libmatroska-c.git
-	ignore = dirty
 [submodule "submodules/mscodec2"]
 	path = submodules/mscodec2
 	url = git://git.linphone.org/mscodec2.git
@@ -113,3 +109,6 @@
 [submodule "submodules/oRTP"]
 	path = submodules/oRTP
 	url = git://git.linphone.org/ortp.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..46f30179f
--- /dev/null
+++ b/submodules/bcmatroska2
@@ -0,0 +1 @@
+Subproject commit 46f30179fcc9d00f35f7d0ef8eacce0a204e4d07
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index a11248a22..99472e6e0 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit a11248a2211a32cb74743e51a2f45af36688e154
+Subproject commit 99472e6e08368ff843c7905f785c98f4f038a29d
diff --git a/submodules/externals/libmatroska-c b/submodules/externals/libmatroska-c
deleted file mode 160000
index 743cc896d..000000000
--- a/submodules/externals/libmatroska-c
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 743cc896d3995bdf87d64e780831d42dbd12c738