diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
index b43f84ba2f..70e6bea37d 100644
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -1324,6 +1324,10 @@ func! Test_edit_rightleft()
 endfunc
 
 func Test_edit_complete_very_long_name()
+  if !has('unix')
+    " Long directory names only work on Unix.
+    return
+  endif
   let save_columns = &columns
   set columns=5000
   call assert_equal(5000, &columns)
diff --git a/src/version.c b/src/version.c
index 16ebc87845..56ff4f6ccf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    531,
 /**/
     530,
 /**/