diff --git a/.gitignore b/.gitignore
index 2857a17..2c95aae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
 /vim-8.0-297.tar.bz2
 /vim-8.0-311.tar.bz2
 /vim-8.0-314.tar.bz2
+/vim-8.0-318.tar.bz2
diff --git a/README.patches b/README.patches
index 69a7ee3..ab1c650 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,39 @@
+commit a9f8ffb6345f5b246944c73b9861fcc53eaa5228
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Feb 9 16:14:53 2017 +0100
+
+    patch 8.0.0318: small mistake in 7x13 font name
+    
+    Problem:    Small mistake in 7x13 font name.
+    Solution:   Use ISO 8859-1 name instead of 10646-1. (Kazunobu Kuriyama)
+
+commit 43dded8c59c0647a70dd52c3125783945d90ae5a
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Feb 9 16:06:17 2017 +0100
+
+    patch 8.0.0317: no test for setting 'guifont'
+    
+    Problem:    No test for setting 'guifont'.
+    Solution:   Add a test for X11 GUIs. (Kazunobu Kuriyama)
+
+commit dad7309dd22f0c6b5de0b031acd7f54d3aa94326
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Feb 9 11:54:50 2017 +0100
+
+    patch 8.0.0316: :help z? does not work
+    
+    Problem:    ":help z?" does not work. (Pavol Juhas)
+    Solution:   Remove exception for z?.
+
+commit a76f59d817e2da31d83b4f0e978b52abe81e0ae9
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Thu Feb 9 11:41:01 2017 +0100
+
+    patch 8.0.0315: :help :[range] does not work
+    
+    Problem:    ":help :[range]" does not work. (Tony Mechelynck)
+    Solution:   Translate to insert a backslash.
+
 commit 65189a1294307abf007faab7385dc0145ba72b06
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Mon Feb 6 22:22:17 2017 +0100
diff --git a/sources b/sources
index 69398a3..027d100 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-314.tar.bz2) = 923533e2b9f8f95f3106cd941541f96d737d9fac2004d8235f7a4c992b888e4e247b84aa4b34e7bc66ac8907359809fe27b8f8ae659f5741e595c124348c8f22
+SHA512 (vim-8.0-318.tar.bz2) = 661a50f9d3d5a58483a597de217c3598a8eb1556d58873bd8d1c98171d0aece67e106c7a1e1910e7f54b177dae5d93192ff4b4d2f6bcde180777f9c5a8fc6aa1
diff --git a/vim.spec b/vim.spec
index 280bfd3..ab7d579 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 314
+%define patchlevel 318
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -765,6 +765,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Thu Feb 09 2017 Karsten Hopp <karsten@redhat.com> 8.0.318-1
+- patchlevel 318
+
 * Tue Feb 07 2017 Karsten Hopp <karsten@redhat.com> 8.0.314-1
 - patchlevel 314, added screenshot to appdata and testing validity of appdata.xml