diff --git a/doc/changelog.txt b/doc/changelog.txt
index a722bcbf..a54226f0 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -11,6 +11,12 @@ Changes:
 - build: Ship Microsoft C++ runtime files directly instead
   of the installer package.
 
+Features:
+- build: Support building a binary installer in 64bit Windows
+  systems.
+- build: The Windows installer is now signed with a local self-signed
+  certificate.
+
 
 6.7 "Friendship" (released 12.4.2011)
 
diff --git a/build.bat b/windows/build.bat
similarity index 100%
rename from build.bat
rename to windows/build.bat
diff --git a/clean.bat b/windows/clean.bat
similarity index 100%
rename from clean.bat
rename to windows/clean.bat
diff --git a/dist.bat b/windows/dist.bat
similarity index 100%
rename from dist.bat
rename to windows/dist.bat
diff --git a/windows/makelccert.bat b/windows/makelccert.bat
new file mode 100644
index 00000000..d6b156e6
--- /dev/null
+++ b/windows/makelccert.bat
@@ -0,0 +1,4 @@
+:: File to generate a code signing certificate for LinkChecker
+:: Needs makecert.exe and pkv2pfx.exe installed in the PATH
+makecert -r -pe -n "CN=LinkChecker certificate" -b 01/01/2011 -e 01/01/2021 -eku 1.3.6.1.5.5.7.3.3 -sv linkchecker.pvk linkchecker.cer
+pvk2pfx -pvk linkchecker.pvk -spc linkchecker.cer -pfx linkchecker.pfx
diff --git a/test.bat b/windows/test.bat
similarity index 100%
rename from test.bat
rename to windows/test.bat