diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index d71d509cf3..7f15a13c10 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -141,8 +141,7 @@ SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon
 ;
 SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder
 	aiff_reader asf_reader au_reader avi_reader $(X86_ONLY)ffmpeg
-	matroska mov_reader musepack
-	ogg raw_decoder speex
+	mov_reader musepack ogg raw_decoder speex
 	$(X86_ONLY)ape_reader
 	# theora
 	vorbis wav_reader
diff --git a/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp b/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp
index d21d72c38d..af38d4f3a2 100644
--- a/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp
+++ b/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp
@@ -42,12 +42,12 @@ static const DemuxerFormat gDemuxerTable[] = {
 		"flv", "Flash Video", "video/x-flv",
 		B_QUICKTIME_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY
 	},
-//	{
-//		// Tested and appears to work ok with regards to video,
-//		// audio seems a problem.
-//		"matroska", "Matroska Movie", "video/x-matroska",
-//		B_MISC_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY
-//	},
+	{
+		// Tested and appears to work ok with regards to video,
+		// audio seems a problem.
+		"matroska", "Matroska Movie", "video/x-matroska",
+		B_MISC_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY
+	},
 //	{
 //		// Plays the limited amount of files I could test with.
 //		"mov", "Quicktime Movie", "video/x-mov",