diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index b7487522ce..9e0ecbe902 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -349,6 +349,9 @@ endfunc
 " Closing a window might cause an endless loop
 " E814 for older Vims
 function Test_autocmd_bufwipe_in_SessLoadPost()
+  if has('win32')
+    throw 'Skipped: test hangs on MS-Windows'
+  endif
   tabnew
   set noswapfile
   let g:bufnr=bufnr('%')
@@ -374,6 +377,9 @@ endfunc
 
 " SEGV occurs in older versions.
 function Test_autocmd_bufwipe_in_SessLoadPost2()
+  if has('win32')
+    throw 'Skipped: test hangs on MS-Windows'
+  endif
   tabnew
   set noswapfile
   let g:bufnr=bufnr('%')
diff --git a/src/version.c b/src/version.c
index 7cd12ebbe7..c9d7361ddb 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 */
+/**/
+    487,
 /**/
     486,
 /**/