diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index bcaed91d233113e897562d96fc59f1234bdb793e..f76f6459b3cee99f4be10a4915d9bf6786cb186a 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -69,8 +69,10 @@ test1.out: test1.in
 .in.out:
 	-rm -rf $*.failed test.ok $(RM_ON_RUN)
 	cp $*.ok test.ok
-	# Sleep a moment to avoid that the xterm title is messed up
-	@-sleep .2
+	# Sleep a moment to avoid that the xterm title is messed up.
+	# 200 msec is sufficient, but only modern sleep supports a fraction of
+	# a second, fall back to a second if it fails.
+	@-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1"
 	-$(RUN_VIM) $*.in
 
 	# For flaky tests retry one time.
diff --git a/src/version.c b/src/version.c
index c745b1c4a335179471fac95f5d41dded91be423a..a28cf6c31de0164b827176c24ea3f113e27c9e15 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    906,
 /**/
     905,
 /**/