diff --git a/src/testdir/test_undo.vim b/src/testdir/test_undo.vim
index e06abff93b..7c93e23153 100644
--- a/src/testdir/test_undo.vim
+++ b/src/testdir/test_undo.vim
@@ -426,7 +426,7 @@ funct Test_undofile()
   let cwd = getcwd()
   if has('win32')
     " Replace windows drive such as C:... into C%...
-    let cwd = substitute(cwd, '^\([A-Z]\):', '\1%', 'g')
+    let cwd = substitute(cwd, '^\([a-zA-Z]\):', '\1%', 'g')
   endif
   let cwd = substitute(cwd . '/Xundofoo', '/', '%', 'g')
   if has('persistent_undo')
diff --git a/src/version.c b/src/version.c
index a25f262b88..2c8b3acc0d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    585,
 /**/
     584,
 /**/