diff --git a/src/db.c b/src/db.c
index af6ce7ab..1b029de5 100644
--- a/src/db.c
+++ b/src/db.c
@@ -3060,7 +3060,7 @@ db_perthread_deinit(void)
 
 #define Q_PL3								\
   "INSERT INTO playlists (id, title, type, query, db_timestamp, path, idx, special_id)" \
-  " VALUES(3, 'Movies', 1, 'media_kind = 32', 0, '', 0, 4);"
+  " VALUES(3, 'Movies', 1, 'media_kind = 2', 0, '', 0, 4);"
 
 #define Q_PL4								\
   "INSERT INTO playlists (id, title, type, query, db_timestamp, path, idx, special_id)" \
@@ -3075,9 +3075,9 @@ db_perthread_deinit(void)
  */
 
 
-#define SCHEMA_VERSION 4
+#define SCHEMA_VERSION 5
 #define Q_SCVER					\
-  "INSERT INTO admin (key, value) VALUES ('schema_version', '4');"
+  "INSERT INTO admin (key, value) VALUES ('schema_version', '5');"
 
 struct db_init_query {
   char *query;
diff --git a/src/filescanner_ffmpeg.c b/src/filescanner_ffmpeg.c
index f2688efd..1a1fc5c7 100644
--- a/src/filescanner_ffmpeg.c
+++ b/src/filescanner_ffmpeg.c
@@ -376,6 +376,11 @@ scan_metadata_ffmpeg(char *file, struct media_file_info *mfi)
       /* I have no idea why this is, but iTunes reports a media kind of 64 for stik==10 (?!) */
       mfi->media_kind = 64;
     }
+  /* Unspecified video files are "Movies", media_kind 2 */
+  else if (mfi->has_video == 1)
+    {
+      mfi->media_kind = 2;
+    }
 
  skip_extract:
   if (mdcount == 0)