diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c0b914d3a8..4be0f18a7d 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -319,6 +319,9 @@ au BufNewFile,BufRead *.cdl			setf cdl
 " Conary Recipe
 au BufNewFile,BufRead *.recipe			setf conaryrecipe
 
+" Corn config file
+au BufNewFile,BufRead *.corn			setf corn
+
 " ChainPack Object Notation (CPON)
 au BufNewFile,BufRead *.cpon			setf cpon
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index c2b4cc790e..9375883e38 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -126,6 +126,7 @@ let s:filename_checks = {
     \ 'confini': ['/etc/pacman.conf', 'any/etc/pacman.conf', 'mpv.conf', 'any/.aws/config', 'any/.aws/credentials', 'file.nmconnection'],
     \ 'context': ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi', 'file.mkxl', 'file.mklx'],
     \ 'cook': ['file.cook'],
+    \ 'corn': ['file.corn'],
     \ 'cpon': ['file.cpon'],
     \ 'cpp': ['file.cxx', 'file.c++', 'file.hh', 'file.hxx', 'file.hpp', 'file.ipp', 'file.moc', 'file.tcc', 'file.inl', 'file.tlh', 'file.cppm', 'file.ccm', 'file.cxxm', 'file.c++m'],
     \ 'cqlang': ['file.cql'],
diff --git a/src/version.c b/src/version.c
index fdb7716a98..08c67bb7c6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1587,
 /**/
     1586,
 /**/