diff --git a/src/testdir/setup.vim b/src/testdir/setup.vim
index 31b133f..cb8bebb 100644
--- a/src/testdir/setup.vim
+++ b/src/testdir/setup.vim
@@ -24,5 +24,7 @@
   " Make sure $HOME does not get read or written.
   " It must exist, gnome tries to create $HOME/.gnome2
   let $HOME = getcwd() . '/XfakeHOME'
-  call mkdir($HOME)
+  if !isdirectory($HOME)
+    call mkdir($HOME)
+  endif
 endif
diff --git a/src/version.c b/src/version.c
index 94aa40e..fa67f7f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    810,
+/**/
     809,
 /**/
     808,