diff --git a/mswin32/Makefile b/mswin32/Makefile
index 6b2d60112..6cfac2d58 100644
--- a/mswin32/Makefile
+++ b/mswin32/Makefile
@@ -1,5 +1,5 @@
 export MSYS2_ARG_CONV_EXCL=*
-MAKENSIS=C:/Program Files (x86)/NSIS3-strlen/makensis.exe
+MAKENSIS=C:/Program Files (x86)/NSIS/makensis.exe
 SIGNTOOL := $(shell reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0" /v "InstallationFolder" | egrep InstallationFolder | cut -d ' ' -f13- | sed 's%\\%/%g' | tr -d '\r\n' | sed 's%$$%bin/x86/signtool.exe%')
 NMAPDIR=..
 NMAPDIR_WIN=$(shell echo '$(NMAPDIR)' | sed 's|/cygdrive/\(.\)|\1:|;s|/|\\|g')
@@ -57,7 +57,8 @@ stage-common: $(NMAPDIR)/CHANGELOG $(NMAPDIR)/LICENSE $(NMAPDIR)/nmap-mac-prefix
 # Install the ndiff batch file wrapper in the zip distribution.
 	cp $(NMAPDIR)/ndiff/ndiff.py nmap-$(NMAP_VERSION)/ndiff.py
 	cp python-wrap.bat nmap-$(NMAP_VERSION)/ndiff.bat
-	cd $(ZENMAP_WINDIR) && sh build.sh
+	make -C $(ZENMAP_WINDIR)
+	rm -rf nmap-$(NMAP_VERSION)/zenmap-w64
 	cp -R $(ZENMAP_WINDIR)/dist/zenmap-w64 nmap-$(NMAP_VERSION)/
 	cp $(NMAPDIR)/zenmap/README nmap-$(NMAP_VERSION)/ZENMAP_README
 	cp $(NMAPDIR)/zenmap/COPYING_HIGWIDGETS nmap-$(NMAP_VERSION)
@@ -123,5 +124,5 @@ LICENSE.formatted: $(NMAPDIR)/LICENSE
 	./license-format/licformat.sh "$<" > "$@"
 
 clean:
-	./Build.bat Clean "$(VCCONFIG)${OEM_SUFFIX}"
+	cmd /c Build.bat Clean "$(VCCONFIG)${OEM_SUFFIX}"
 	rm -rf make-vars.make nmap-$(NMAP_VERSION) nmap-$(NMAP_VERSION)-oem Debug Release Release-oem msbuild.log LICENSE.formatted