diff --git a/tools/release b/tools/release
index 4418f4d..24c43b1 100755
--- a/tools/release
+++ b/tools/release
@@ -58,6 +58,9 @@ python2.5 ./eggsetup.py bdist_egg
 # bdist_wininst)
 ./setup.py bdist_wininst --install-script=ipython_win_post_install.py
 
+# Change name so retarded Vista runs the installer correctly
+rename 's/win32/win32-setup/' $ipdir/dist/*.exe
+
 # Register with the Python Package Index (PyPI)
 echo "Registering with PyPI..."
 cd $ipdir
diff --git a/tools/testrel b/tools/testrel
index 4faac6d..726ccd7 100755
--- a/tools/testrel
+++ b/tools/testrel
@@ -2,13 +2,13 @@
 
 # release test
 
+cd ~/ipython/ipython
+
 # clean up build/dist directories
-rm -rf ~/ipython/ipython/build/*
-rm -rf ~/ipython/ipython/dist/*
+rm -rf build/*
+rm -rf dist/*
 
 # build source distros
-cd ~/ipython/ipython
-
 ./setup.py sdist --formats=gztar
 
 # Build rpms
@@ -23,3 +23,6 @@ python2.5 ./eggsetup.py bdist_egg
 # get pulled into Unix builds (setup.py has code which checks for
 # bdist_wininst)
 ./setup.py bdist_wininst --install-script=ipython_win_post_install.py
+
+# Change name so retarded Vista runs the installer correctly
+rename 's/win32/win32-setup/' dist/*.exe