diff --git a/.gitignore b/.gitignore
index 3e8483f..813c052 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@
 /vim-8.0-598.tar.bz2
 /vim-8.0-599.tar.bz2
 /vim-8.0-600.tar.bz2
+/vim-8.0-604.tar.bz2
diff --git a/README.patches b/README.patches
index 93bb907..e70429e 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,40 @@
+commit 712598f210570627534246cb5dcbb4f213367997
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed May 24 10:42:37 2017 +0200
+
+    patch 8.0.0604: gF test fails still on MS-Windows
+    
+    Problem:    gF test fails still on MS-Windows.
+    Solution:   Use : before the line number and remove it from 'isfname'.
+
+commit d7aca7a71c7254501c08f04db1798df479df0e89
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed May 24 10:05:56 2017 +0200
+
+    patch 8.0.0603: gF test fails on MS-Windows
+    
+    Problem:    gF test fails on MS-Windows.
+    Solution:   Use @ instead of : before the line number
+
+commit 2a79ed293c077ba791db962f0e121cf97ba4f7a7
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed May 24 09:51:39 2017 +0200
+
+    patch 8.0.0602: when gF fails to edit the file the cursor still moves
+    
+    Problem:    When gF fails to edit the file the cursor still moves to the found
+                line number.
+    Solution:   Check the return value of do_ecmd(). (Michael Hwang)
+
+commit 545cb79da586be3333a0a55616046f94b01f6b1a
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue May 23 11:31:22 2017 +0200
+
+    patch 8.0.0601: no test coverage for :spellrepall
+    
+    Problem:    No test coverage for :spellrepall.
+    Solution:   Add a test. (Dominique Pelle, closes #1717)
+
 commit 2a0b06def49198aef45ef173f524a638a700f9c9
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Thu May 18 16:23:43 2017 +0200
diff --git a/sources b/sources
index 3350248..fed125a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-600.tar.bz2) = f7a7ef66ceab87f5ba5ee923aef6a54aa886abbdd286b1970d5a98e99a5e961afe4415b28b39c7b8326a700059ab3eae14260c0175a39116caeb48d049953877
+SHA512 (vim-8.0-604.tar.bz2) = 67d804478a27b52e033ec4bb63d62b175856f7c8352966dfeb939ce99d7351e2e628f1a7b017e1e4050b82627925bec35b9b49ca45664001daae410a0dd4f9a6
diff --git a/vim.spec b/vim.spec
index ea2cbf9..fdf0ed8 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 600
+%define patchlevel 604
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -770,6 +770,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Thu May 25 2017 Karsten Hopp <karsten@redhat.com> 8.0.604-1
+- patchlevel 604
+
 * Fri May 19 2017 Karsten Hopp <karsten@redhat.com> 8.0.600-1
 - patchlevel 600