diff --git a/GNUmakefile b/GNUmakefile
index ff8f06ec..2a0ff4cb 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -665,7 +665,7 @@ dlltest.exe: cryptopp.dll $(DLLTESTOBJS)
 	$(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS)
 
 # This recipe prepares the distro files
-TEXT_FILES := *.h *.cpp adhoc.cpp.proto License.txt Readme.txt Install.txt Filelist.txt CMakeLists.txt config.compat Doxyfile cryptest* cryptlib* dlltest* cryptdll* *.sln *.vcxproj *.filters cryptopp.rc TestVectors/*.txt TestData/*.dat TestScripts/*.sh TestScripts/*.pl
+TEXT_FILES := *.h *.cpp adhoc.cpp.proto License.txt Readme.txt Install.txt Filelist.txt CMakeLists.txt config.compat Doxyfile cryptest* cryptlib* dlltest* cryptdll* *.sln *.vcxproj *.filters cryptopp.rc TestVectors/*.txt TestData/*.dat TestScripts/*.sh TestScripts/*.pl TestScripts/*.cmd
 EXEC_FILES := GNUmakefile GNUmakefile-cross TestData/ TestVectors/ TestScripts/
 
 ifeq ($(wildcard Filelist.txt),Filelist.txt)
@@ -686,9 +686,9 @@ endif
 convert:
 	-$(CHMOD) 0700 TestVectors/ TestData/ TestScripts/
 	-$(CHMOD) 0600 $(TEXT_FILES) *.asm *.S *.zip *.cmake TestVectors/*.txt TestData/*.dat
-	-$(CHMOD) 0700 $(EXEC_FILES) *.sh *.cmd TestScripts/*.sh TestScripts/*.pl
+	-$(CHMOD) 0700 $(EXEC_FILES) *.sh *.cmd TestScripts/*.sh TestScripts/*.pl TestScripts/*.cmd
 	-$(CHMOD) 0700 *.cmd *.sh GNUmakefile GNUmakefile-cross TestScripts/*.sh TestScripts/*.pl
-	-unix2dos --keepdate --quiet $(TEXT_FILES) *.asm *.cmd *.cmake TestScripts/*.pl
+	-unix2dos --keepdate --quiet $(TEXT_FILES) *.asm *.cmd *.cmake TestScripts/*.pl TestScripts/*.cmd
 	-dos2unix --keepdate --quiet GNUmakefile GNUmakefile-cross *.S *.sh TestScripts/*.sh
 ifneq ($(IS_DARWIN),0)
 	-xattr -c *
diff --git a/TestScripts/cryptdll-windows.cmd b/TestScripts/cryptdll-windows.cmd
new file mode 100755
index 00000000..fadfd638
--- /dev/null
+++ b/TestScripts/cryptdll-windows.cmd
@@ -0,0 +1,18 @@
+REM  cryptdll-windows.cmd - written and placed in public domain by Jeffrey Walton
+REM                         Copyright assigned to the Crypto++ project.
+REM
+REM  For details see https://cryptopp.com/wiki/MSBuild_(Command_Line)
+REM
+
+REM  Build the Win32/Debug cryptest.exe
+msbuild /t:Build /p:Configuration=Debug;Platform=Win32 cryptlib.vcxproj
+msbuild /t:Build /p:Configuration=Debug;Platform=Win32 cryptest.vcxproj
+
+REM  Build the Win32/Release cryptopp.dll
+msbuild /t:Build /p:Configuration=Release;Platform=Win32 cryptdll.vcxproj
+
+REM  Build the FIPS test driver
+msbuild /t:Build /p:Configuration=Release;Platform=Win32 dlltest.vcxproj
+
+REM  Run the FIPS test driver
+.\Win32\DLL_Output\Release\dlltest.exe