diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index 3361649..283b0cc 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -41,7 +41,7 @@
     call assert_equal('', getfontname('notexist'))
 
     " Valid font name. This is usually the real name of 7x13 by default.
-    let l:fname = '-Misc-Fixed-Medium-R-Normal--13-120-75-75-C-70-ISO10646-1'
+    let l:fname = '-misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1'
     call assert_equal(l:fname, getfontname(l:fname))
 
   elseif has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3')
diff --git a/src/version.c b/src/version.c
index 50c6fb1..1448e98 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    318,
+/**/
     317,
 /**/
     316,