diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index f019c75a11..55bb45162b 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1771,6 +1771,9 @@ au BufNewFile,BufRead *.nt			setf ntriples
 " Nu
 au BufNewFile,BufRead *.nu		setf nu
 
+" Numbat
+au BufNewFile,BufRead *.nbt		setf numbat
+
 " Oblivion Language and Oblivion Script Extender
 au BufNewFile,BufRead *.obl,*.obse,*.oblivion,*.obscript  setf obse
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 2f5189d230..286132b839 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -567,6 +567,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     nsis: ['file.nsi', 'file.nsh'],
     ntriples: ['file.nt'],
     nu: ['file.nu'],
+    numbat: ['file.nbt'],
     obj: ['file.obj'],
     objdump: ['file.objdump', 'file.cppobjdump'],
     obse: ['file.obl', 'file.obse', 'file.oblivion', 'file.obscript'],
diff --git a/src/version.c b/src/version.c
index 9b2b53c195..20243ac5db 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1504,
 /**/
     1503,
 /**/