diff --git a/GNUmakefile b/GNUmakefile
index 15b4be75..5da949d9 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -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/cryptest-win.pl
-	-$(CHMOD) 0700 *.cmd *.sh GNUmakefile GNUmakefile-cross
-	-unix2dos --keepdate --quiet $(TEXT_FILES) *.asm *.cmd *.cmake TestScripts/cryptest-win.pl
+	-$(CHMOD) 0700 $(EXEC_FILES) *.sh *.cmd TestScripts/*.sh TestScripts/*.pl
+	-$(CHMOD) 0700 *.cmd *.sh GNUmakefile GNUmakefile-cross TestScripts/*.sh TestScripts/*.pl
+	-unix2dos --keepdate --quiet $(TEXT_FILES) *.asm *.cmd *.cmake TestScripts/*.pl
 	-dos2unix --keepdate --quiet GNUmakefile GNUmakefile-cross *.S *.sh TestScripts/*.sh
 ifneq ($(IS_DARWIN),0)
 	-xattr -c *
diff --git a/TestScripts/cryptest-windows.pl b/TestScripts/cryptest-windows.pl
new file mode 100755
index 00000000..543d9209
--- /dev/null
+++ b/TestScripts/cryptest-windows.pl
@@ -0,0 +1,23 @@
+#!/usr/bin/env perl
+
+# cryptest-windows.sh - written and placed in public domain by Jeffrey Walton and Uri Blumenthal.
+#                       Copyright assigned to Crypto++ project.
+
+# This is a test script that can be used on some Windows machines to automate building the
+# library and running the self test with various combinations of flags, options, and conditions.
+# For more details, see http://cryptopp.com/wiki/cryptest-windows.pl.
+
+# To run the script, copy cryptest-windows.pl from TestScripts to the root and then perform the following:
+#     .\cryptest-windows.pl
+
+use strict;
+use warnings;
+
+my $DEBUG32_CXXFLAGS="/DDEBUG";
+my $RELEASE32_CXXFLAGS="/DNDEBUG";
+
+my $DEBUG64_CXXFLAGS="/DDEBUG";
+my $RELASE64_CXXFLAGS="/DNDEBUG";
+
+system('nmake', '/f', 'cryptest.nmake', 'clean');
+system('nmake', '/f', 'cryptest.nmake', 'CXXFLAGS="DEBUG32_CXXFLAGS"');