diff --git a/src/testdir/test_modeline.vim b/src/testdir/test_modeline.vim
index c1eb991..d29bbb5 100644
--- a/src/testdir/test_modeline.vim
+++ b/src/testdir/test_modeline.vim
@@ -44,6 +44,9 @@
 endfunc
 
 func Test_modeline_keymap()
+  if !has('keymap')
+    return
+  endif
   call writefile(['vim: set keymap=greek :', 'nothing'], 'Xmodeline_keymap')
   let modeline = &modeline
   set modeline
diff --git a/src/version.c b/src/version.c
index 42ce472..ce8595e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    546,
+/**/
     545,
 /**/
     544,