diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 77c736c..ad6ddc6 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -668,7 +668,7 @@
 au BufNewFile,BufRead *.fsi,*.fsx		setf fsharp
 
 " GDB command files
-au BufNewFile,BufRead .gdbinit,gdbinit		setf gdb
+au BufNewFile,BufRead .gdbinit,gdbinit,.gdbearlyinit,gdbearlyinit,*.gdb		setf gdb
 
 " GDMO
 au BufNewFile,BufRead *.mo,*.gdmo		setf gdmo
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 0b65119..48229ad 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -196,7 +196,7 @@
     \ 'fstab': ['fstab', 'mtab'],
     \ 'fusion': ['file.fusion'],
     \ 'fvwm': ['/.fvwm/file', 'any/.fvwm/file'],
-    \ 'gdb': ['.gdbinit', 'gdbinit'],
+    \ 'gdb': ['.gdbinit', 'gdbinit', 'file.gdb', '.config/gdbearlyinit', '.gdbearlyinit'],
     \ 'gdresource': ['file.tscn', 'file.tres'],
     \ 'gdscript': ['file.gd'],
     \ 'gdmo': ['file.mo', 'file.gdmo'],
diff --git a/src/version.c b/src/version.c
index 51b6370..777f131 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4571,
+/**/
     4570,
 /**/
     4569,