diff --git a/.gitignore b/.gitignore
index 53f42a3..2349a27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,4 @@
 /vim-8.0-628.tar.bz2
 /vim-8.0-636.tar.bz2
 /vim-8.0-642.tar.bz2
+/vim-8.0-647.tar.bz2
diff --git a/README.patches b/README.patches
index 49ed0ae..925e836 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,53 @@
+commit 06f1ed2f78c5c03af95054fc3a8665df39dec362
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Jun 18 22:41:03 2017 +0200
+
+    patch 8.0.0647: syntax highlighting can make cause a freeze
+    
+    Problem:    Syntax highlighting can make cause a freeze.
+    Solution:   Apply 'redrawtime' to syntax highlighting, per window.
+
+commit 0946326580e6f034fe2c88d041407ea0fde980ab
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sat Jun 17 20:55:06 2017 +0200
+
+    patch 8.0.0646: the hlsearch test fails on fast systems
+    
+    Problem:    The hlsearch test fails on fast systems.
+    Solution:   Make the search pattern slower.  Fix that the old regexp engine
+                doesn't timeout properly.
+
+commit 1ef9bbe215e13a273e74fccaddd8fc5a42c76b6e
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sat Jun 17 20:08:20 2017 +0200
+
+    patch 8.0.0645: no error for illegal back reference in NFA engine
+    
+    Problem:    The new regexp engine does not give an error for using a back
+                reference where it is not allowed. (Dominique Pelle)
+    Solution:   Check the back reference like the old engine. (closes #1774)
+
+commit 5b1affefd0e96154517ec6f71300086ae6d22d24
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sat Jun 17 19:13:49 2017 +0200
+
+    patch 8.0.0644: the timeout for 'hlsearch' is not tested
+    
+    Problem:    There is no test for 'hlsearch' timing out.
+    Solution:   Add a test.
+
+commit fbd0b0af6800f6ff89857863d6a07ea03f09ff6c
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sat Jun 17 18:44:21 2017 +0200
+
+    patch 8.0.0643: when a pattern search is slow Vim becomes unusable
+    
+    Problem:    When 'hlsearch' is set and matching with the last search pattern
+                is very slow, Vim becomes unusable.  Cannot quit search by
+                pressing CTRL-C.
+    Solution:   When the search times out set a flag and don't try again.  Check
+                for timeout and CTRL-C in NFA loop that adds states.
+
 commit 8cf91286ca46a501d24e4b7d631b193256782c88
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Tue Jun 13 19:38:37 2017 +0200
diff --git a/sources b/sources
index 5d2d8ed..6a59b85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-642.tar.bz2) = b3325830b488a45f13ec74044b05dc73f7c3505fb137a35b8ef53f6df73c5ab669926d5b1a186e0ef33e738ec7436307e02d3f93c3847ca18ee577c237e455df
+SHA512 (vim-8.0-647.tar.bz2) = 7798d048adb78fc6020690b2abdb66041fb6d061548f8d0712c3a10eb95f06e3a8cf7dece936f22702d5d03f758aaab0a8f6103ae0c96d1d58f47a04bfb6ed03
diff --git a/vim.spec b/vim.spec
index 3f66ab3..e7dbb8b 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 642
+%define patchlevel 647
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -770,6 +770,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Mon Jun 19 2017 Karsten Hopp <karsten@redhat.com> 8.0.647-1
+- patchlevel 647
+
 * Thu Jun 15 2017 Karsten Hopp <karsten@redhat.com> 8.0.642-1
 - patchlevel 642