diff --git a/src/testdir/test_gf.vim b/src/testdir/test_gf.vim
index d5bdfab652..ef1bf1075b 100644
--- a/src/testdir/test_gf.vim
+++ b/src/testdir/test_gf.vim
@@ -38,7 +38,8 @@ func Test_gF()
   w! Xfile
   close
   new
-  call setline(1, ['one', 'Xfile@3', 'three'])
+  set isfname-=:
+  call setline(1, ['one', 'Xfile:3', 'three'])
   2
   call assert_fails('normal gF', 'E37:')
   call assert_equal(2, getcurpos()[1])
@@ -47,6 +48,7 @@ func Test_gF()
   call assert_equal('Xfile', bufname('%'))
   call assert_equal(3, getcurpos()[1])
 
+  set isfname&
   call delete('Xfile')
   call delete('Xfile2')
   bwipe Xfile
diff --git a/src/version.c b/src/version.c
index 6a650356e2..bc80ace741 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    604,
 /**/
     603,
 /**/