diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 7c5b0ee..11ecd9a 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -61,6 +61,7 @@
 
 clean:
 	-del *.out
+	-del *.failed
 	-if exist test.ok del test.ok
 	-if exist small.vim del small.vim
 	-if exist tiny.vim del tiny.vim
@@ -68,18 +69,22 @@
 	-if exist mzscheme.vim del mzscheme.vim
 	-if exist lua.vim del lua.vim
 	-del X*
+	-if exist Xdir1 rd /s /q Xdir1
+	-if exist Xfind rd /s /q Xfind
 	-if exist viminfo del viminfo
 	-del test.log
 
 .in.out:
+	-if exist $*.failed del $*.failed
 	copy $*.ok test.ok
 	$(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in
-	@diff test.out $*.ok & if errorlevel 1 (echo $* FAILED >> test.log ) \
-		else ( del /F $*.out & rename test.out $*.out )
+	@diff test.out $*.ok & if errorlevel 1 \
+		( move /y test.out $*.failed & echo $* FAILED >> test.log ) \
+		else ( move /y test.out $*.out )
 	-del X*
-	-del X*.*
 	-del test.ok
-	-rd /s /q Xfind
+	-if exist Xdir1 rd /s /q Xdir1
+	-if exist Xfind rd /s /q Xfind
 	-if exist viminfo del viminfo
 
 nolog:
diff --git a/src/version.c b/src/version.c
index 86f8a85..09f5871 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1218,
+/**/
     1217,
 /**/
     1216,