diff --git a/.gitignore b/.gitignore
index d98981cc..fd78fad3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /.classpath
 /.project
 /.settings/
+/.idea
\ No newline at end of file
diff --git a/src/main/resources/magic.gz b/src/main/resources/magic.gz
index b1b32074..e6606e95 100644
Binary files a/src/main/resources/magic.gz and b/src/main/resources/magic.gz differ
diff --git a/src/test/java/com/j256/simplemagic/ContentInfoUtilTest.java b/src/test/java/com/j256/simplemagic/ContentInfoUtilTest.java
index 4f5be80d..b26fbabb 100644
--- a/src/test/java/com/j256/simplemagic/ContentInfoUtilTest.java
+++ b/src/test/java/com/j256/simplemagic/ContentInfoUtilTest.java
@@ -40,6 +40,8 @@ public class ContentInfoUtilTest {
 	 */
 	private FileType[] fileTypes = new FileType[] { //
 			//
+			new FileType("/files/x.mkv", ContentType.MATROSKA, "matroska", "video/x-matroska",
+					"Matroska data", false),
 			new FileType("/files/x.fits", ContentType.FITS, "fits", "application/fits", "FITS data", false),
 			new FileType("/files/x.gif", ContentType.GIF, "gif", "image/gif", "GIF image data, version 89a, 32 x 32",
 					false),
@@ -122,6 +124,8 @@ public class ContentInfoUtilTest {
 					"Adobe Illustrator, version 1.5", false),
 			new FileType("/files/x.amr", ContentType.AMR, "amr", "audio/amr",
 					"Adaptive Multi-Rate Codec (GSM telephony)", false),
+			new FileType("/files/dvd.ts", ContentType.VIDEO_MPEG, "mpeg", "video/mpeg",
+					"MPEG transport stream data", false)
 			// end
 	};
 
diff --git a/src/test/resources/files/dvd.ts b/src/test/resources/files/dvd.ts
new file mode 100755
index 00000000..b9f54e4c
Binary files /dev/null and b/src/test/resources/files/dvd.ts differ
diff --git a/src/test/resources/files/x.mkv b/src/test/resources/files/x.mkv
new file mode 100644
index 00000000..0f41bbd3
Binary files /dev/null and b/src/test/resources/files/x.mkv differ