diff --git a/src/testdir/test_suspend.vim b/src/testdir/test_suspend.vim
index ab1a091..ef8fea5 100644
--- a/src/testdir/test_suspend.vim
+++ b/src/testdir/test_suspend.vim
@@ -22,9 +22,9 @@
   CheckFeature terminal
   CheckExecutable /bin/sh
 
-  " Somehow the modifyOtherKeys response may get to the terminal when using Mac
-  " OS.  Make t_RK empty to avoid that.
-  set t_RK=
+  " Somehow the modifyOtherKeys response may get to the terminal when using
+  " Mac OS.  Make t_RK and 'keyprotocol' empty to avoid that.
+  set t_RK= keyprotocol=
 
   call WaitForResponses()
 
@@ -72,9 +72,9 @@
   CheckFeature terminal
   CheckExecutable /bin/sh
 
-  " Somehow the modifyOtherKeys response may get to the terminal when using Mac
-  " OS.  Make t_RK empty to avoid that.
-  set t_RK=
+  " Somehow the modifyOtherKeys response may get to the terminal when using
+  " Mac OS.  Make t_RK and 'keyprotocol' empty to avoid that.
+  set t_RK= keyprotocol=
 
   call WaitForResponses()
 
diff --git a/src/version.c b/src/version.c
index 4ba888e..eb34e00 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1018,
+/**/
     1017,
 /**/
     1016,