diff --git a/wxPython/b b/wxPython/b
index 4f6136fb0a..76bf2f284d 100755
--- a/wxPython/b
+++ b/wxPython/b
@@ -9,6 +9,8 @@ function getpyver {
 	PYVER=2.1
     elif [ "$1" = "22" ]; then
 	PYVER=2.2
+    elif [ "$1" = "23" ]; then
+	PYVER=2.3
     else
 	echo You must specify Python version as first parameter.
         exit
@@ -30,7 +32,7 @@ OTHERFLAGS=""
 # "c" --> clean
 if [ "$1" =  "c" ]; then
     shift
-    CMD="$SETUP $FLAGS $OTHERFLAGS clean"
+    CMD="$SETUP $FLAGS $OTHERFLAGS clean $*"
     OTHERCMD="rm -f wxPython/*.so"
 
 # "d" --> clean extension modules only
@@ -47,12 +49,12 @@ elif [ "$1" = "t" ]; then
 # "i" --> install
 elif [ "$1" = "i" ]; then
     shift
-    CMD="$SETUP $FLAGS $OTHERFLAGS install"
+    CMD="$SETUP $FLAGS $OTHERFLAGS install $*"
 
 # "s" --> source dist
 elif [ "$1" = "s" ]; then
     shift
-    CMD="$SETUP $OTHERFLAGS sdist"
+    CMD="$SETUP $OTHERFLAGS sdist $*"
 
 # "r" --> rpm dist
 elif [ "$1" = "r" ]; then
diff --git a/wxPython/setup.py b/wxPython/setup.py
index e1c1bd3c31..27464f0de0 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -240,11 +240,7 @@ if FINAL:
     HYBRID = 0
 
 if UNICODE and WXPORT not in ['msw', 'gtk2']:
-    raise SystemExit, "UNICODE mode not surrently supported on this WXPORT."
-
-if UNICODE:
-    BUILD_BASE = BUILD_BASE + '.unicode'
-    VERSION = VERSION + 'u'
+    raise SystemExit, "UNICODE mode not surrently supported on this WXPORT: "+WXPORT
 
 
 #----------------------------------------------------------------------
@@ -389,9 +385,12 @@ elif os.name == 'posix':
         WXPLAT = '__WXGTK__'
         GENDIR = 'gtk' # no code differences so use the same generated sources
         portcfg = os.popen('pkg-config gtk+-2.0 --cflags', 'r').read()[:-1]
+        BUILD_BASE = BUILD_BASE + '-' + WXPORT
+        print "got here..."
     elif WXPORT == 'x11':
         WXPLAT = '__WXX11__'
         portcfg = ''
+        BUILD_BASE = BUILD_BASE + '-' + WXPORT
     else:
         raise SystemExit, "Unknown WXPORT value: " + WXPORT
 
@@ -429,6 +428,15 @@ else:
     raise 'Sorry Charlie...'
 
 
+#----------------------------------------------------------------------
+# post platform setup checks and tweaks
+#----------------------------------------------------------------------
+
+if UNICODE:
+    BUILD_BASE = BUILD_BASE + '.unicode'
+    VERSION = VERSION + 'u'
+
+
 #----------------------------------------------------------------------
 # Check if the version file needs updated
 #----------------------------------------------------------------------