diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 89b1d16..e281c89 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1269,7 +1269,8 @@
 
 
 tags: notags
-	$(CTAGS) *.c *.cpp *.h if_perl.xs
+	$(CTAGS) *.c *.cpp *.h
+	if exist auto\if_perl.c $(CTAGS) --append=yes auto\if_perl.c
 
 notags:
 	- if exist tags del tags
@@ -1323,7 +1324,7 @@
 	$(MAKE) /NOLOGO -f Make_dos.mak nolog
 	$(MAKE) /NOLOGO -f Make_dos.mak $@.res
 	$(MAKE) /NOLOGO -f Make_dos.mak report
-	cat messages
+	type messages
 	cd ..
 
 ###########################################################################
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 58949a4..70ea3dc 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1660,12 +1660,6 @@
 endfunc
 
 func Test_terminal_does_not_truncate_last_newlines()
-  " FIXME: currently doens't work for Windows
-  if has('win32')
-    return
-  endif
-
-  let cmd = 'cat'
   let contents = [
   \   [ 'One', '', 'X' ],
   \   [ 'Two', '', '' ],
@@ -1674,11 +1668,15 @@
 
   for c in contents
     call writefile(c, 'Xfile')
-    exec 'term' cmd 'Xfile'
+    if has('win32')
+      term cmd /c type Xfile
+    else
+      term cat Xfile
+    endif
     let bnr = bufnr('$')
     call assert_equal('terminal', getbufvar(bnr, '&buftype'))
     call WaitForAssert({-> assert_equal('finished', term_getstatus(bnr))})
-    sleep 50m
+    sleep 100m
     call assert_equal(c, getline(1, line('$')))
     quit
   endfor
diff --git a/src/version.c b/src/version.c
index 1edb1d2..252d047 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    525,
+/**/
     524,
 /**/
     523,