diff --git a/src/testdir/test40.in b/src/testdir/test40.in
index f6fb612..d92a18f 100644
--- a/src/testdir/test40.in
+++ b/src/testdir/test40.in
@@ -3,18 +3,18 @@
 STARTTEST
 :so small.vim
 :/^start/,$w! Xxx		" write lines below to Xxx
-:au BufReadCmd testA 0r Xxx|$del
-:e testA			" will read text of Xxd instead
-:au BufWriteCmd testA call append(line("$"), "write")
+:au BufReadCmd XtestA 0r Xxx|$del
+:e XtestA			" will read text of Xxd instead
+:au BufWriteCmd XtestA call append(line("$"), "write")
 :w				" will append a line to the file
-:r testA			" should not read anything
+:r XtestA			" should not read anything
 :				" now we have:
 :				" 1	start of Xxx
 :				" 2		test40
 :				" 3	end of Xxx
 :				" 4	write
-:au FileReadCmd testB '[r Xxx
-:2r testB			" will read Xxx below line 2 instead
+:au FileReadCmd XtestB '[r Xxx
+:2r XtestB			" will read Xxx below line 2 instead
 :				" 1	start of Xxx
 :				" 2		test40
 :				" 3	start of Xxx
@@ -22,10 +22,10 @@
 :				" 5	end of Xxx
 :				" 6	end of Xxx
 :				" 7	write
-:au FileWriteCmd testC '[,']copy $
+:au FileWriteCmd XtestC '[,']copy $
 4GA1
-:4,5w testC			" will copy lines 4 and 5 to the end
-:r testC			" should not read anything
+:4,5w XtestC			" will copy lines 4 and 5 to the end
+:r XtestC			" should not read anything
 :				" 1	start of Xxx
 :				" 2		test40
 :				" 3	start of Xxx
@@ -35,14 +35,14 @@
 :				" 7	write
 :				" 8		test401
 :				" 9	end of Xxx
-:au FILEAppendCmd testD '[,']w! test.out
-:w >>testD			" will write all lines to test.out
-:$r testD			" should not read anything
+:au FILEAppendCmd XtestD '[,']w! test.out
+:w >>XtestD			" will write all lines to test.out
+:$r XtestD			" should not read anything
 :$w >>test.out			" append "end of Xxx" to test.out
-:au BufReadCmd testE 0r test.out|$del
-:sp testE			" split window with test.out
+:au BufReadCmd XtestE 0r test.out|$del
+:sp XtestE			" split window with test.out
 5Goasdf:"
-:au BufWriteCmd testE w! test.out
+:au BufWriteCmd XtestE w! test.out
 :wall				" will write other window to test.out
 :				" 1	start of Xxx
 :				" 2		test40
diff --git a/src/version.c b/src/version.c
index 0b76a0e..13dd6ba 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    818,
+/**/
     817,
 /**/
     816,