diff --git a/tools/build_release b/tools/build_release
index 5fbea8b..e74dfa3 100755
--- a/tools/build_release
+++ b/tools/build_release
@@ -28,18 +28,8 @@ sh('./setup.py sdist --formats=gztar,zip')
 # Build eggs
 sh('python ./setupegg.py bdist_egg')
 
-# Call the windows build separately, so that the extra Windows scripts don't
-# get pulled into Unix builds (setup.py has code which checks for
-# bdist_wininst).  Note that the install scripts args are added to the main
-# distutils call in setup.py, so they don't need to be passed here.
-sh("python setup.py bdist_wininst")
-
-# The Windows 64-bit installer can't be built by a Linux/Mac Python because ofa
-# bug in distutils:  http://bugs.python.org/issue6792.
-# So we have to build it with a wine-installed native Windows Python...
-sh("%s/.wine/dosdevices/c\:/Python27/python.exe setup.py build "
-   "--plat-name=win-amd64 bdist_wininst "
-   "--install-script=ipython_win_post_install.py" % os.environ['HOME'])
+# Run windows builds
+map(sh, win_builds)
 
 # Change name so retarded Vista runs the installer correctly
 sh("rename 's/linux-i686/win32/' dist/*.exe")
diff --git a/tools/release b/tools/release
index ecf07d0..8744b0d 100755
--- a/tools/release
+++ b/tools/release
@@ -50,6 +50,8 @@ sh('./setup.py register')
 
 # Upload all files
 sh('./setup.py sdist --formats=gztar,zip upload')
+for wb in win_builds:
+    sh(wb + ' upload')
 cd(distdir)
 print( 'Uploading distribution files...')
 
diff --git a/tools/toollib.py b/tools/toollib.py
index 0396204..c803836 100644
--- a/tools/toollib.py
+++ b/tools/toollib.py
@@ -19,6 +19,21 @@ archive_user = 'ipython@archive.ipython.org'
 archive_dir = 'archive.ipython.org'
 archive = '%s:%s' % (archive_user, archive_dir)
 
+# Commands for Windows builds.
+# We do them separately, so that the extra Windows scripts don't get pulled
+# into Unix builds (setup.py has code which checks for bdist_wininst).  Note
+# that the install scripts args are added to the main distutils call in
+# setup.py, so they don't need to be passed here.
+#
+# The Windows 64-bit installer can't be built by a Linux/Mac Python because ofa
+# bug in distutils:  http://bugs.python.org/issue6792.
+# So we have to build it with a wine-installed native Windows Python...
+win_builds = ["python setup.py bdist_wininst",
+              r"%s/.wine/dosdevices/c\:/Python27/python.exe setup.py build "
+              "--plat-name=win-amd64 bdist_wininst "
+              "--install-script=ipython_win_post_install.py" %
+              os.environ['HOME'] ]
+
 # Utility functions
 def sh(cmd):
     """Run system command in shell, raise SystemExit if it returns an error."""