diff --git a/wxPython/CHANGES.txt b/wxPython/CHANGES.txt
index f548255c04..05e11a920e 100644
--- a/wxPython/CHANGES.txt
+++ b/wxPython/CHANGES.txt
@@ -2,6 +2,16 @@ CHANGES.txt for wxPython
 
 ----------------------------------------------------------------------
 
+2.4.0
+------
+No major new features since 2.3.4.2, mostly bug fixes and minor
+enhancements.
+
+Added function wrappers for the common dialogs from Kevin Altis.  See
+wxPython/lib/dialogs.py for more details.
+
+
+
 2.3.4.2
 -------
 Various bug fixes.
diff --git a/wxPython/distrib/mac/resources/Welcome.txt b/wxPython/distrib/mac/resources/Welcome.txt
index 4c7c001620..745a4313ce 100644
--- a/wxPython/distrib/mac/resources/Welcome.txt
+++ b/wxPython/distrib/mac/resources/Welcome.txt
@@ -1,2 +1,2 @@
-You will be guided through the steps necessary to install wxPython 2.3.4.2 (including wxMac) for MachoPython 2.2.x on Mac OS X 10.1 or later.
+You will be guided through the steps necessary to install wxPython 2.4.0 (including wxMac) for MachoPython 2.2.x on Mac OS X 10.1 or later.
 
diff --git a/wxPython/distrib/makerpm b/wxPython/distrib/makerpm
index c0d83b200a..e5548825f3 100755
--- a/wxPython/distrib/makerpm
+++ b/wxPython/distrib/makerpm
@@ -40,8 +40,9 @@ function useage {
     echo "   skiprpm        Don't build the RPM (but why?)"
     echo "   skipclean      Don't do the cleanup at the end"
     echo "   gtk2           Build using wxGTK2 and Unicode"
+    echo "   x11            Build using wxX11"
     echo "   speconly       Do nothing but write the RPM spec file"
-    echo "   smp            Add SMP=2 to the envivonment to speed wxGTK build"
+#    echo "   smp            Add SMP=2 to the envivonment to speed wxGTK build"
 }
 
 if [ $# -lt 3 ]; then
@@ -88,6 +89,7 @@ for flag in $*; do
 	skiptar)   skiptar=1                           ;;
 	skiprpm)   skiprpm=1                           ;;
 	gtk2)      unicode=1; port=GTK2; lcport=gtk2   ;;
+	x11)       port=X11; lcport=x11                ;;
 	smp)       export SMP=2                        ;;
 	speconly)  makespec; exit 0                    ;;
 
diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index bad8b2203a..461cfbf477 100644
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -21,10 +21,14 @@
 # that are turned into Python exceptions starting with 2.3.4.
 %define debug_flag 1
 
+
+%if %{unicode}
+    %define uniflag u
+%endif
 %if %{debug_flag}
-    %define wxconfigname %{wxpref}/bin/wx%{lcport}d-%{ver2}-config
+    %define wxconfigname %{wxpref}/bin/wx%{lcport}%{uniflag}d-%{ver2}-config
 %else
-    %define wxconfigname %{wxpref}/bin/wx%{lcport}-%{ver2}-config
+    %define wxconfigname %{wxpref}/bin/wx%{lcport}%{uniflag}-%{ver2}-config
 %endif
 
 
@@ -122,6 +126,7 @@ cd $WXDIR/wxPython
 %{python} setup.py \
 	IN_CVS_TREE=1 \
 	NO_SCRIPTS=1 \
+	WXPORT=%{lcport} \
 	WX_CONFIG="$WXDIR/build/wx-config --inplace --prefix=$RPM_BUILD_ROOT%{wxpref}" \
 	build
 
@@ -140,6 +145,7 @@ cd $WXDIR/wxPython
 %{python} setup.py \
 	IN_CVS_TREE=1 \
 	NO_SCRIPTS=1 \
+	WXPORT=%{lcport} \
 	WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
 	install \
 	--root=$RPM_BUILD_ROOT
diff --git a/wxPython/setup.py b/wxPython/setup.py
index 27464f0de0..1fdf1b4875 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -28,6 +28,8 @@ on.
 """
 
 
+# Config values below this point can be reset on the setup.py command line.
+
 BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
 BUILD_OGL = 1      # If true, build the contrib/ogl extension module
 BUILD_STC = 1      # If true, build the contrib/stc extension module