diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index acb87ff934..15fd7f4ab4 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -714,7 +714,7 @@ au BufNewFile,BufRead gitolite.conf		setf gitolite
 au BufNewFile,BufRead {,.}gitolite.rc,example.gitolite.rc	setf perl
 
 " Gnuplot scripts
-au BufNewFile,BufRead *.gpi			setf gnuplot
+au BufNewFile,BufRead *.gpi,.gnuplot		setf gnuplot
 
 " Go (Google)
 au BufNewFile,BufRead *.go			setf go
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index ff2af5fb38..fb1aa6349a 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -203,7 +203,7 @@ let s:filename_checks = {
     \ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'],
     \ 'gkrellmrc': ['gkrellmrc', 'gkrellmrc_x'],
     \ 'gnash': ['gnashrc', '.gnashrc', 'gnashpluginrc', '.gnashpluginrc'],
-    \ 'gnuplot': ['file.gpi'],
+    \ 'gnuplot': ['file.gpi', '.gnuplot'],
     \ 'go': ['file.go'],
     \ 'gomod': ['go.mod'],
     \ 'gp': ['file.gp', '.gprc'],
diff --git a/src/version.c b/src/version.c
index 8e659e0286..1d5160f5e7 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 */
+/**/
+    4187,
 /**/
     4186,
 /**/