diff --git a/src/add-ons/media/plugins/matroska/Jamfile b/src/add-ons/media/plugins/matroska/Jamfile
index ad74fd5d03..4f92aa3fe3 100644
--- a/src/add-ons/media/plugins/matroska/Jamfile
+++ b/src/add-ons/media/plugins/matroska/Jamfile
@@ -2,18 +2,22 @@ SubDir OBOS_TOP src add-ons media plugins matroska ;
 
 UsePrivateHeaders media ;
 
-SubDirHdrs [ FDirName $(SUBDIR) libmatroska ] ;
+# SubDirHdrs [ FDirName $(SUBDIR) libmatroska ] ;
+SubDirHdrs [ FDirName $(SUBDIR) libMatroskaParser ] ;
 
 Addon matroska : media plugins :
 	matroska_reader.cpp
 	:
 	false
 	:
-	libebml.a
-	libmatroska.a
+#	libebml.a
+#	libmatroska.a
+	libMatroskaParser.a
+	libz.a
 ;
 
 LinkSharedOSLibs matroska : be libmedia.so ;
 
-SubInclude OBOS_TOP src add-ons media plugins matroska libebml ;
-SubInclude OBOS_TOP src add-ons media plugins matroska libmatroska ;
+# SubInclude OBOS_TOP src add-ons media plugins matroska libebml ;
+# SubInclude OBOS_TOP src add-ons media plugins matroska libmatroska ;
+SubInclude OBOS_TOP src add-ons media plugins matroska libMatroskaParser ;
diff --git a/src/add-ons/media/plugins/matroska/libMatroskaParser/Jamfile b/src/add-ons/media/plugins/matroska/libMatroskaParser/Jamfile
new file mode 100644
index 0000000000..6e3ab32403
--- /dev/null
+++ b/src/add-ons/media/plugins/matroska/libMatroskaParser/Jamfile
@@ -0,0 +1,7 @@
+SubDir OBOS_TOP src add-ons media plugins matroska libMatroskaParser ;
+
+SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) $(DOTDOT) $(DOTDOT) $(DOTDOT) libs zlib ] ;
+
+StaticLibrary MatroskaParser :
+	MatroskaParser.c
+;