diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc
index e37f89c2f..bdba20fd4 100644
--- a/sys/winnt/Makefile.msc
+++ b/sys/winnt/Makefile.msc
@@ -534,7 +534,7 @@ rc=Rc
 # Visual Studio we are using.  We set VSVER to 0000 to flag any version that 
 # is too old or untested.
 #
-#NMAKE version 1425286140 is distributed with latest VS 2019
+#NMAKE version 1426288060 is distributed with latest VS 2019
 
 #!MESSAGE $(MAKEFLAGS)
 #!MESSAGE $(MAKEDIR)
@@ -558,19 +558,22 @@ VSVER=2013
 VSVER=2015
 !ELSEIF ($(MAKEVERSION) > 1411000000) && ($(MAKEVERSION) < 1416270312)
 VSVER=2017
-!ELSEIF ($(MAKEVERSION) > 1416270311) && ($(MAKEVERSION) < 1425286141)
+!ELSEIF ($(MAKEVERSION) > 1416270311) && ($(MAKEVERSION) < 1426288061)
 VSVER=$(VSNEWEST)
-!ELSEIF ($(MAKEVERSION) > 1421277022)
+!ELSEIF ($(MAKEVERSION) > 1426288060)
 VSVER=2999              #untested future version
 !ENDIF
 
 !IF ($(VSVER) >= 2012)
+!IF ($(VSVER) <= $(VSNEWEST))
 !MESSAGE Autodetected Visual Studio $(VSVER)
-!ELSEIF ($(VSVER) == 2999
-!MESSAGE The version of Visual Studio is newer than the most recent at
-!MESSAGE the time this Makefile was crafted (Visual Studio $(VSNEWEST)).
-!MESSAGE Because it is newer we'll proceed expecting that the 
-!MESSAGE VS$(VSNEWEST) processing will still work.
+!ENDIF
+!ENDIF
+!IF ($(VSVER) == 2999)
+!MESSAGE The NMAKE version of this Visual Studio $(_NMAKE_VER) is newer than the
+!MESSAGE most recent at the time this Makefile was crafted (Visual Studio $(VSNEWEST)).
+!MESSAGE Because it is newer we'll proceed expecting that the VS$(VSNEWEST) processing
+!MESSAGE will still work.
 !ELSEIF ($(VSVER) == 0000)
 !MESSAGE The version of Visual Studio appears to be quite old, older
 !MESSAGE than VS2010 which is the oldest supported version by this