diff --git a/scripts/ipython_win_post_install.py b/scripts/ipython_win_post_install.py
index 248df5c..3349027 100755
--- a/scripts/ipython_win_post_install.py
+++ b/scripts/ipython_win_post_install.py
@@ -40,6 +40,7 @@ def install():
         print ('To take full advantage of IPython, you need readline from:\n'
                'http://sourceforge.net/projects/uncpythontools')
 
+    ipybase = '"'+prefix+r'\scripts\ipython"'
     # Create IPython entry ...
     if not os.path.isdir(ip_dir):
         os.mkdir(ip_dir)
@@ -47,15 +48,15 @@ def install():
 
     # Create program shortcuts ...
     f = ip_dir + r'\IPython.lnk'
-    a = prefix + r'\scripts\ipython'
+    a = ipybase
     mkshortcut(python,'IPython',f,a)
 
     f = ip_dir + r'\pysh.lnk'
-    a = prefix + r'\scripts\ipython -p sh'
+    a = ipybase+' -p sh'
     mkshortcut(python,'IPython command prompt mode',f,a)
 
     f = ip_dir + r'\scipy.lnk'
-    a = prefix + r'\scripts\ipython -pylab -p scipy'
+    a = ipybase+' -pylab -p scipy'
     mkshortcut(python,'IPython scipy profile',f,a)
 
     # Create documentation shortcuts ...    
diff --git a/tools/mkrel.py b/tools/mkrel.py
index b806a94..7ad6ec8 100755
--- a/tools/mkrel.py
+++ b/tools/mkrel.py
@@ -14,8 +14,10 @@ def c(cmd):
     os.system(cmd)
 
 os.chdir('..')
-distutils.dir_util.remove_tree('dist')
-distutils.dir_util.remove_tree('ipykit')
+if os.path.isdir('dist'):
+    distutils.dir_util.remove_tree('dist')
+if os.path.isdir('ipykit'):
+    distutils.dir_util.remove_tree('ipykit')
 
 c("python exesetup.py py2exe")
 os.rename('dist','ipykit')