diff --git a/Tools/buildbot/buildmsi.bat b/Tools/buildbot/buildmsi.bat
new file mode 100644
index 0000000..367a2a4
--- /dev/null
+++ b/Tools/buildbot/buildmsi.bat
@@ -0,0 +1,23 @@
+@rem Used by the buildbot "buildmsi" step.
+
+cmd /c Tools\buildbot\external.bat
+@rem build release versions of things
+call "%VS71COMNTOOLS%vsvars32.bat"
+if not exist ..\db-4.4.20\build_win32\release\libdb44s.lib (
+   devenv ..\db-4.4.20\build_win32\Berkeley_DB.sln /build Release /project db_static
+)
+
+@rem build Python
+cmd /q/c Tools\buildbot\kill_python.bat
+devenv.com /useenv /build Release PCbuild\pcbuild.sln
+
+@rem fetch the documentation
+python Tools/buildbot/getchm.py
+
+@rem buold the MSI file
+cd PC
+nmake /f icons.mak
+cd ..\Tools\msi
+del *.msi
+nmake /f msisupport.mak
+%HOST_PYTHON% msi.py
diff --git a/Tools/buildbot/getchm.py b/Tools/buildbot/getchm.py
new file mode 100644
index 0000000..b09c5b2
--- /dev/null
+++ b/Tools/buildbot/getchm.py
@@ -0,0 +1,6 @@
+# We cannot build the documentation on Windows, so download an old
+# one instead.
+import urllib, os
+if not os.path.exists("Doc/python25.chm"):
+    urllib.urlretrieve("http://www.python.org/ftp/python/2.5.1/Python25.chm",
+        "Doc/python25.chm")