diff --git a/wxPython/distrib/mac/_buildPython b/wxPython/distrib/mac/_buildPython
index 1fdf2165cc..57774d1bb6 100755
--- a/wxPython/distrib/mac/_buildPython
+++ b/wxPython/distrib/mac/_buildPython
@@ -13,7 +13,7 @@ progDir="`dirname \"$0\"`"
 defDstPath="/projects/wx/wxPython/dist"
 
 pkgName="MachoPython"
-version=2.2.1-3
+version=2.2.1-4
 dmgRoot="dmg-root"
 pkgRoot="pkg-root"
 sitePkgDir="$pkgRoot/Library/Frameworks/Python.framework/Versions/$PYVER/lib/python$PYVER/site-packages"
diff --git a/wxPython/scripts/CreateBatchFiles.py b/wxPython/scripts/CreateBatchFiles.py
index 60c4d520a4..269a55d25d 100644
--- a/wxPython/scripts/CreateBatchFiles.py
+++ b/wxPython/scripts/CreateBatchFiles.py
@@ -30,14 +30,18 @@ template = """\
 %s %s\\%s %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9
 """
 
-for script, usegui in scripts:
-    batfile = os.path.join(scriptdir, script + '.bat')
-    print "Creating", batfile
-    f = open(batfile, 'w')
-    if usegui:
-        f.write(template % (pythonw, scriptdir, script))
-    else:
-        f.write(template % (python, scriptdir, script))
-    f.close()
+def main():
+    for script, usegui in scripts:
+        batfile = os.path.join(scriptdir, script + '.bat')
+        print "Creating", batfile
+        f = open(batfile, 'w')
+        if usegui:
+            f.write(template % (pythonw, scriptdir, script))
+        else:
+            f.write(template % (python, scriptdir, script))
+        f.close()
 
 
+if __name__ == '__main__':
+    main()
+
diff --git a/wxPython/scripts/CreateMacSripts.py b/wxPython/scripts/CreateMacSripts.py
new file mode 100644
index 0000000000..c01f2ce023
--- /dev/null
+++ b/wxPython/scripts/CreateMacSripts.py
@@ -0,0 +1,51 @@
+#----------------------------------------------------------------------
+# Name:         CreateMacScriptspy
+# Purpose:	Massages the scripts to be usable with MachoPython
+#
+# Author:       Robin Dunn
+#
+# Created:      12-Aug-2002
+# Copyright:    (c) 2002 by Total Control Software
+# Licence:      wxWindows license
+#----------------------------------------------------------------------
+
+import sys, os
+
+python = sys.executable
+destdir = os.path.split(python)[0]
+pythonw = os.path.join(destdir, 'pythonw')
+scriptdir = os.getcwd()
+
+from CreateBatchFiles import scripts
+repltxt = "#!/usr/bin/env python"
+
+gui_template = """\
+#!/bin/sh
+exec /Applications/Python.app/Contents/MacOS/python %s.py
+"""
+
+def main():
+    for script, usegui in scripts:
+        destfile = os.path.join(destdir, script)
+        print "Creating", destfile
+        thescript = open(script).read()
+        if usegui:
+            f = open(destfile+'.py', 'w')
+            f.write(thescript.replace(repltxt, ''))
+            f.close()
+            f = open(destfile, 'w')
+            f.write(gui_template % destfile)
+            f.close()
+
+        else:
+            thescript = thescript.replace(repltxt, '#!'+python)
+            f = open(destfile, 'w')
+            f.write(thescript)
+            f.close()
+
+        os.chmod(destfile, 0755)
+
+
+if __name__ == '__main__':
+    main()
+
diff --git a/wxPython/setup.py b/wxPython/setup.py
index ac2a4aeda4..2c65f03fb8 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -64,6 +64,9 @@ UNDEF_NDEBUG = 1   # Python 2.2 on Unix/Linux by default defines NDEBUG,
                    # on then you end up with mismatched class structures,
                    # and wxPython will crash.
 
+NO_SCRIPTS = 0     # Don't install the tool scripts
+
+
 WX_CONFIG = "wx-config"    # Usually you shouldn't need to touch this,
                            # but you can set it to pass an alternate
                            # version of wx-config or alternate flags,
@@ -138,7 +141,8 @@ if bcpp_compiling:
 # Boolean (int) flags
 for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
              'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN',
-             'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE', 'UNDEF_NDEBUG',
+             'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE',
+             'UNDEF_NDEBUG', 'NO_SCRIPTS',
              'FINAL', 'HYBRID', ]:
     for x in range(len(sys.argv)):
         if string.find(sys.argv[x], flag) == 0:
@@ -307,6 +311,7 @@ elif os.name == 'posix' and sys.platform[:6] == "darwin":
     lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
     lflags = string.split(lflags)
 
+    NO_SCRIPTS = 1
 
 
 elif os.name == 'posix':
@@ -881,14 +886,17 @@ if not GL_ONLY and BUILD_DLLWIDGET:
 ##                                     "tools/XRCed/README"]),
 ##          ]
 
-SCRIPTS = ['scripts/img2png',
-           'scripts/img2xpm',
-           'scripts/img2py',
-           'scripts/xrced',
-           'scripts/pyshell',
-           'scripts/pycrust',
-           ],
 
+if NO_SCRIPTS:
+    SCRIPTS = None
+else:
+    SCRIPTS = [opj('scripts/img2png'),
+               opj('scripts/img2xpm'),
+               opj('scripts/img2py'),
+               opj('scripts/xrced'),
+               opj('scripts/pyshell'),
+               opj('scripts/pycrust'),
+               ]
 
 
 #----------------------------------------------------------------------
@@ -921,7 +929,6 @@ if __name__ == "__main__":
               options = { 'build' : { 'build_base' : BUILD_BASE }},
 
               ##data_files = TOOLS,
-
               scripts = SCRIPTS,
               )