diff --git a/setupegg.py b/setupegg.py
index beeab3d..d3d7643 100755
--- a/setupegg.py
+++ b/setupegg.py
@@ -2,6 +2,7 @@
 """Wrapper to run setup.py using setuptools."""
 
 import os
+import shutil
 import sys
 
 # now, import setuptools and call the actual setup
@@ -10,4 +11,10 @@ execfile('setup.py')
 
 # clean up the junk left around by setuptools
 if "develop" not in sys.argv:
-    os.unlink('ipython.egg-info')
+    try:
+        shutil.rmtree('ipython.egg-info')
+    except:
+        try:
+            os.unlink('ipython.egg-info')
+        except:
+            pass
diff --git a/tools/build_release b/tools/build_release
index 6ecee50..4c5e786 100755
--- a/tools/build_release
+++ b/tools/build_release
@@ -24,10 +24,10 @@ c('./setup.py sdist --formats=gztar,zip')
 # Build version-specific RPMs, where we must use the --python option to ensure
 # that the resulting RPM is really built with the requested python version (so
 # things go to lib/python2.X/...)
-c("python2.5 ./setup.py bdist_rpm --binary-only --release=py25 "
-  "--python=/usr/bin/python2.5")
-c("python2.6 ./setup.py bdist_rpm --binary-only --release=py26 "
-  "--python=/usr/bin/python2.6")
+#c("python2.5 ./setup.py bdist_rpm --binary-only --release=py25 "
+#  "--python=/usr/bin/python2.5")
+#c("python2.6 ./setup.py bdist_rpm --binary-only --release=py26 "
+#  "--python=/usr/bin/python2.6")
 
 # Build eggs
 c('python2.5 ./setupegg.py bdist_egg')
@@ -36,7 +36,7 @@ c('python2.6 ./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)
-c("python setup.py bdist_wininst --install-script=ipython_win_post_install.py")
+c("python ./setup.py bdist_wininst")
 
 # Change name so retarded Vista runs the installer correctly
 c("rename 's/linux-i686/win32-setup/' dist/*.exe")