diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 65a8798..296d49e 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -166,8 +166,11 @@
 
 # Read MAJOR and MINOR from version.h.
 !IF ![for /f "tokens=2,3" %I in (version.h) do \
-	@if "%I"=="VIM_VERSION_MAJOR" ( echo MAJOR=%J>.\major.tmp ) \
-	else if "%I"=="VIM_VERSION_MINOR" ( echo MINOR=%J>.\minor.tmp )]
+	@if "%I"=="VIM_VERSION_MAJOR" ( \
+		echo MAJOR=%J> .\major.tmp \
+	) else if "%I"=="VIM_VERSION_MINOR" ( \
+		echo MINOR=%J> .\minor.tmp && exit \
+	)]
 !ENDIF
 
 !IF EXIST(.\major.tmp)
@@ -189,11 +192,15 @@
 !ENDIF
 
 # Read PATCHLEVEL from version.c.
-!IF ![cmd.exe /V:ON /C "echo off && set LINE=0&& set FIND=0&& \
-	for /f "tokens=1,3 delims=,[ " %I in (version.c) do \
-	( set /A LINE+=1 > NUL && \
-	if "%J"=="included_patches" ( set /A FIND=LINE+3 > NUL ) \
-	else if "!LINE!"=="!FIND!" ( echo PATCHLEVEL=%I>.\patchlvl.tmp && exit ) )"]
+!IF ![cmd.exe /V:ON /Q /C "set LINE=0&& set FIND=0&& \
+	for /f "tokens=1,3 delims=, " %I in (version.c) do ( \
+		set /A LINE+=1 > NUL && \
+		if "%J"=="included_patches[^]" ( \
+			set /A FIND=LINE+3 > NUL \
+		) else if "!LINE!"=="!FIND!" ( \
+			echo PATCHLEVEL=%I> .\patchlvl.tmp && exit \
+		) \
+	)"]
 !ENDIF
 !IF EXIST(.\patchlvl.tmp)
 ! INCLUDE .\patchlvl.tmp
diff --git a/src/version.c b/src/version.c
index a1e9e53..ef2f542 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    659,
+/**/
     658,
 /**/
     657,