diff --git a/wxPython/distrib/mac/wxPythonOSX/resources/Welcome.txt b/wxPython/distrib/mac/wxPythonOSX/resources/Welcome.txt
index b88e56d666..2e42c46710 100644
--- a/wxPython/distrib/mac/wxPythonOSX/resources/Welcome.txt
+++ b/wxPython/distrib/mac/wxPythonOSX/resources/Welcome.txt
@@ -1,5 +1,5 @@
 Welcome!
 
-This program will install wxPython 2.4.0.2 for MacPython-OSX 2.3.
+This program will install wxPython 2.4.0.4 for MacPython-OSX 2.3.
 
-Build date:   Tue Jan 28 17:04:12 PST 2003
+Build date:   Thu Mar  6 00:08:13 PST 2003
diff --git a/wxPython/distrib/mac/wxPythonOSX/resources/postflight b/wxPython/distrib/mac/wxPythonOSX/resources/postflight
index 4d5964eda5..d40918e7f0 100755
--- a/wxPython/distrib/mac/wxPythonOSX/resources/postflight
+++ b/wxPython/distrib/mac/wxPythonOSX/resources/postflight
@@ -4,13 +4,13 @@
 /usr/local/bin/python -O $2/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3/site-packages/../compileall.py $2/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3/site-packages/wxPython
 
 # and in the demo
-/usr/local/bin/python $2/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3/site-packages/../compileall.py /Applications/wxPythonOSX-2.4.0.2/demo
+/usr/local/bin/python $2/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3/site-packages/../compileall.py /Applications/wxPythonOSX-2.4.0.4/demo
 
 # Make the demo/data dir writable
-chmod a+w /Applications/wxPythonOSX-2.4.0.2/demo/data
+chmod a+w /Applications/wxPythonOSX-2.4.0.4/demo/data
 
 # and the wxPython pacakge should be group writable
 chmod -R g+w $2/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3/site-packages/wxPython
-chmod -R g+w /Applications/wxPythonOSX-2.4.0.2
+chmod -R g+w /Applications/wxPythonOSX-2.4.0.4
 
 exit 0
diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 819aa33dd7..137469829b 100644
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -354,15 +354,16 @@ def find_DLLs():
 
 #----------------------------------------------------------------------
 
+locale_template = 'Source: "%s";  DestDir: "{app}\%s"; Components: core'
+
 def build_locale_string():
-    template = 'Source: "%s";  DestDir: "{app}\%s"; Components: core'
     stringlst = []
 
     def walk_helper(lst, dirname, files):
         for f in files:
             filename = os.path.join(dirname, f)
             if not os.path.isdir(filename):
-                lst.append( template % (filename, dirname) )
+                lst.append( locale_template % (filename, dirname) )
 
     os.path.walk('wxPython\\locale', walk_helper, stringlst)
     return '\n'.join(stringlst)
diff --git a/wxPython/distrib/makerpm b/wxPython/distrib/makerpm
index 65f9f1a65d..cf3ab49b75 100755
--- a/wxPython/distrib/makerpm
+++ b/wxPython/distrib/makerpm
@@ -129,6 +129,7 @@ if [ -z "${skipcvs}" ]; then
     if [ -e ${tarver} ]; then
 	rm -rf ${tarver}
     fi
+    echo cvs -d ${cvsroot} export -r ${cvs_tag} -d ${tarver} wxWindows
     cvs -d ${cvsroot} export -r ${cvs_tag} -d ${tarver} wxWindows > /dev/null 2>&1
     if [ "$?" != "0" ]; then
 	echo "*** CVS failure, exiting."
diff --git a/wxPython/scripts/pycwrap b/wxPython/scripts/pycwrap
index 911c5ec778..e60800bf80 100755
--- a/wxPython/scripts/pycwrap
+++ b/wxPython/scripts/pycwrap
@@ -5,3 +5,4 @@ import sys, os
 
 sys.path.insert(0, os.curdir)
 main(sys.argv)
+
diff --git a/wxPython/setup.py b/wxPython/setup.py
index 5e4adeb2a3..feb7a313f9 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -753,6 +753,7 @@ if BUILD_STC:
             msg('Running gen_iface.py, regenerating stc.h and stc.cpp...')
             cwd = os.getcwd()
             os.chdir(opj(CTRB_SRC, 'stc'))
+            sys.path.insert(0, os.curdir)
             import gen_iface
             gen_iface.main([])
             os.chdir(cwd)
diff --git a/wxPython/src/wxc.rc b/wxPython/src/wxc.rc
index 0f16edf830..70b574d596 100644
--- a/wxPython/src/wxc.rc
+++ b/wxPython/src/wxc.rc
@@ -1,5 +1,5 @@
 aa_wxpicon ICON "wxp.ico"
 #include "wx/msw/wx.rc"
 
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "wxc.pyd.manifest"
+