diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 462023365a..bcd36b521c 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1539,6 +1539,9 @@ au BufNewFile,BufRead *.plp			setf plp
 " PO and PO template (GNU gettext)
 au BufNewFile,BufRead *.po,*.pot		setf po
 
+" Pony
+au BufNewFile,BufRead *.pony			setf pony
+
 " Postfix main config
 au BufNewFile,BufRead main.cf,main.cf.proto	setf pfmain
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 4d77dc8258..70e79eae2b 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -448,6 +448,7 @@ let s:filename_checks = {
     \ 'pod': ['file.pod'],
     \ 'poefilter': ['file.filter'],
     \ 'poke': ['file.pk'],
+    \ 'pony': ['file.pony'],
     \ '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 7882c231a9..f0a816f577 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 */
+/**/
+    1412,
 /**/
     1411,
 /**/