diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index e537d9331..06ffcfe4f 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -844,8 +844,8 @@ au BufNewFile,BufRead *.hex,*.h32		setf hex
 " Hjson
 au BufNewFile,BufRead *.hjson			setf hjson
 
-" HLS Playlist
-au BufNewFile,BufRead *.m3u8			setf hlsplaylist
+" HLS Playlist (or another form of playlist)
+au BufNewFile,BufRead *.m3u,*.m3u8		setf hlsplaylist
 
 " Hollywood
 au BufRead,BufNewFile *.hws			setf hollywood
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index e2177e503..3b3d9a5b9 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -255,7 +255,7 @@ let s:filename_checks = {
     \ 'hex': ['file.hex', 'file.h32'],
     \ 'hgcommit': ['hg-editor-file.txt'],
     \ 'hjson': ['file.hjson'],
-    \ 'hlsplaylist': ['file.m3u8'],
+    \ 'hlsplaylist': ['file.m3u', 'file.m3u8'],
     \ 'hog': ['file.hog', 'snort.conf', 'vision.conf'],
     \ 'hollywood': ['file.hws'],
     \ 'hoon': ['file.hoon'],
diff --git a/src/version.c b/src/version.c
index 79dda65a3..fdd6a239f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    583,
 /**/
     582,
 /**/