diff --git a/Makefile.in b/Makefile.in
index 57bb950dc5..018a19bf8f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1153,7 +1153,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/mobile/styles/*.cpp $(DISTDIR)/samples/mobile/styles
 	cp $(SAMPDIR)/mobile/styles/*.h $(DISTDIR)/samples/mobile/styles
 	cp $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
-    
+
 	mkdir $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
 	cp $(SAMPDIR)/dialup/makefile.unx $(DISTDIR)/samples/dialup
@@ -1449,6 +1449,7 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/wxPython
 	mkdir $(DISTDIR)/wxPython/wxPython/lib
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust/decor
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/colourchooser
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
@@ -1481,6 +1482,7 @@ PYTHON_DIST:
 	cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
 	cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
 	cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/decor/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust/decor
 	cp $(WXDIR)/wxPython/wxPython/lib/colourchooser/*.py $(DISTDIR)/wxPython/wxPython/lib/colourchooser
 	cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
 	cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 5847a5cebf..a4a2a4de29 100644
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -159,6 +159,7 @@ Source: "scripts\img2xpm";                  DestDir: "{code:GetPythonDir}\Script
 Source: "scripts\xrced";                    DestDir: "{code:GetPythonDir}\Scripts"; Components: tools
 Source: "scripts\pyshell";                  DestDir: "{code:GetPythonDir}\Scripts"; Components: tools
 Source: "scripts\pycrust";                  DestDir: "{code:GetPythonDir}\Scripts"; Components: tools
+Source: "scripts\pycwrap";                  DestDir: "{code:GetPythonDir}\Scripts"; Components: tools
 
 Source: "samples\doodle\*.py";              DestDir: "{app}\wxPython\samples\doodle"; Components: samples
 Source: "samples\doodle\*.txt";             DestDir: "{app}\wxPython\samples\doodle"; Components: samples
diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index eae4d22099..fa0745bb6f 100644
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -190,6 +190,7 @@ for s in \
 	img2py \
 	img2xpm \
 	pycrust \
+	pycwrap \
 	pyshell \
 	xrced; do
     cp scripts/$s $RPM_BUILD_ROOT/%{pref}/bin
diff --git a/wxPython/scripts/CreateBatchFiles.py b/wxPython/scripts/CreateBatchFiles.py
index b03044b667..871650d52f 100644
--- a/wxPython/scripts/CreateBatchFiles.py
+++ b/wxPython/scripts/CreateBatchFiles.py
@@ -22,6 +22,7 @@ scripts = [ ("img2png", 0),
             ("xrced",   1),
             ("pyshell", 1),
             ("pycrust", 1),
+            ("pycwrap", 1),
             ("helpviewer", 1),
             ]
 
diff --git a/wxPython/scripts/helpviewer.bat b/wxPython/scripts/helpviewer.bat
index 77bfee9447..d881374690 100755
--- a/wxPython/scripts/helpviewer.bat
+++ b/wxPython/scripts/helpviewer.bat
@@ -1,3 +1,3 @@
 @echo off
 
-start E:\TOOLS\PYTHON22\pythonw.exe E:\projects\wx\wxPython\scripts\helpviewer %1 %2 %3 %4 %5 %6 %7 %8 %9
+start e:\tools\Python22\pythonw.exe e:\PROJECTS\wx\wxPython\scripts\helpviewer %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/wxPython/scripts/img2png.bat b/wxPython/scripts/img2png.bat
index 30b12097fe..a69fee0c02 100755
--- a/wxPython/scripts/img2png.bat
+++ b/wxPython/scripts/img2png.bat
@@ -1,3 +1,3 @@
 @echo off
 
-E:\TOOLS\PYTHON22\PYTHON.EXE E:\projects\wx\wxPython\scripts\img2png %1 %2 %3 %4 %5 %6 %7 %8 %9
+e:\tools\Python22\python.exe e:\PROJECTS\wx\wxPython\scripts\img2png %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/wxPython/scripts/img2py.bat b/wxPython/scripts/img2py.bat
index 422c6b7938..e2451895ec 100755
--- a/wxPython/scripts/img2py.bat
+++ b/wxPython/scripts/img2py.bat
@@ -1,3 +1,3 @@
 @echo off
 
-E:\TOOLS\PYTHON22\PYTHON.EXE E:\projects\wx\wxPython\scripts\img2py %1 %2 %3 %4 %5 %6 %7 %8 %9
+e:\tools\Python22\python.exe e:\PROJECTS\wx\wxPython\scripts\img2py %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/wxPython/scripts/img2xpm.bat b/wxPython/scripts/img2xpm.bat
index be53e1f836..45bff43e11 100755
--- a/wxPython/scripts/img2xpm.bat
+++ b/wxPython/scripts/img2xpm.bat
@@ -1,3 +1,3 @@
 @echo off
 
-E:\TOOLS\PYTHON22\PYTHON.EXE E:\projects\wx\wxPython\scripts\img2xpm %1 %2 %3 %4 %5 %6 %7 %8 %9
+e:\tools\Python22\python.exe e:\PROJECTS\wx\wxPython\scripts\img2xpm %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/wxPython/scripts/pycrust.bat b/wxPython/scripts/pycrust.bat
index 320f717dfc..a2fc4f3416 100755
--- a/wxPython/scripts/pycrust.bat
+++ b/wxPython/scripts/pycrust.bat
@@ -1,3 +1,3 @@
 @echo off
 
-start E:\TOOLS\PYTHON22\pythonw.exe E:\projects\wx\wxPython\scripts\pycrust %1 %2 %3 %4 %5 %6 %7 %8 %9
+start e:\tools\Python22\pythonw.exe e:\PROJECTS\wx\wxPython\scripts\pycrust %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/wxPython/scripts/pycwrap b/wxPython/scripts/pycwrap
new file mode 100755
index 0000000000..911c5ec778
--- /dev/null
+++ b/wxPython/scripts/pycwrap
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from wxPython.lib.PyCrust.wrap import main
+import sys, os
+
+sys.path.insert(0, os.curdir)
+main(sys.argv)
diff --git a/wxPython/scripts/pycwrap.bat b/wxPython/scripts/pycwrap.bat
new file mode 100755
index 0000000000..40562b5629
--- /dev/null
+++ b/wxPython/scripts/pycwrap.bat
@@ -0,0 +1,3 @@
+@echo off
+
+start e:\tools\Python22\pythonw.exe e:\PROJECTS\wx\wxPython\scripts\pycwrap %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/wxPython/scripts/pyshell.bat b/wxPython/scripts/pyshell.bat
index a616194aaa..fff21cd258 100755
--- a/wxPython/scripts/pyshell.bat
+++ b/wxPython/scripts/pyshell.bat
@@ -1,3 +1,3 @@
 @echo off
 
-start E:\TOOLS\PYTHON22\pythonw.exe E:\projects\wx\wxPython\scripts\pyshell %1 %2 %3 %4 %5 %6 %7 %8 %9
+start e:\tools\Python22\pythonw.exe e:\PROJECTS\wx\wxPython\scripts\pyshell %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/wxPython/scripts/xrced.bat b/wxPython/scripts/xrced.bat
index 38385c3ba3..2bfdd300cb 100755
--- a/wxPython/scripts/xrced.bat
+++ b/wxPython/scripts/xrced.bat
@@ -1,3 +1,3 @@
 @echo off
 
-start E:\TOOLS\PYTHON22\pythonw.exe E:\projects\wx\wxPython\scripts\xrced %1 %2 %3 %4 %5 %6 %7 %8 %9
+start e:\tools\Python22\pythonw.exe e:\PROJECTS\wx\wxPython\scripts\xrced %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/wxPython/setup.py b/wxPython/setup.py
index 021930f41a..5e4adeb2a3 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -13,7 +13,7 @@ from distutils.command.install_data import install_data
 # flags and values that affect this script
 #----------------------------------------------------------------------
 
-VERSION          = "2.4.0.4p"
+VERSION          = "2.4.0.4"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
@@ -1180,6 +1180,7 @@ else:
                opj('scripts/xrced'),
                opj('scripts/pyshell'),
                opj('scripts/pycrust'),
+               opj('scripts/pycwrap'),
                ]
 
 
@@ -1204,6 +1205,7 @@ if __name__ == "__main__":
                           PKGDIR+'.lib.editor',
                           PKGDIR+'.lib.mixins',
                           PKGDIR+'.lib.PyCrust',
+                          PKGDIR+'.lib.PyCrust.decor',
                           PKGDIR+'.tools',
                           PKGDIR+'.tools.XRCed',
                           ],