diff --git a/elodie/media/video.py b/elodie/media/video.py
index a53d238a..204e37d2 100644
--- a/elodie/media/video.py
+++ b/elodie/media/video.py
@@ -28,7 +28,7 @@ class Video(Media):
     __name__ = 'Video'
 
     #: Valid extensions for video files.
-    extensions = ('avi', 'm4v', 'mov', 'mp4', 'mpg', 'mpeg', '3gp', 'mts')
+    extensions = ('avi', 'm4v', 'mov', 'mp4', 'mpg', 'mpeg', '3gp', 'mts', 'mkv')
 
     def __init__(self, source=None):
         super(Video, self).__init__(source)
diff --git a/elodie/tests/media/video_test.py b/elodie/tests/media/video_test.py
index 759b39f4..c11c0c99 100644
--- a/elodie/tests/media/video_test.py
+++ b/elodie/tests/media/video_test.py
@@ -26,6 +26,7 @@ def test_video_extensions():
     assert 'mov' in extensions
     assert 'm4v' in extensions
     assert '3gp' in extensions
+    assert 'mkv' in extensions
 
     valid_extensions = Video.get_valid_extensions()