diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 259e5eeb3c..311e6a81ec 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1334,6 +1334,9 @@ au BufNewFile,BufRead *.pml			setf promela
 au BufNewFile,BufRead *.proto			setf proto
 au BufNewFile,BufRead *.pbtxt			setf pbtxt
 
+" Poke
+au BufNewFile,BufRead *.pk      		setf poke
+
 " Protocols
 au BufNewFile,BufRead */etc/protocols		setf protocols
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index ba8879c82d..11b6baeb83 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -374,6 +374,7 @@ let s:filename_checks = {
     \ 'po': ['file.po', 'file.pot'],
     \ 'pod': ['file.pod'],
     \ 'pod6': ['file.pod6'],
+    \ 'poke': ['file.pk'],
     \ 'postscr': ['file.ps', 'file.pfa', 'file.afm', 'file.eps', 'file.epsf', 'file.epsi', 'file.ai'],
     \ 'pov': ['file.pov'],
     \ 'povini': ['.povrayrc'],
diff --git a/src/version.c b/src/version.c
index 1eecf5d98a..76a95b9b6c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2591,
 /**/
     2590,
 /**/