diff --git a/wxPython/b.bat b/wxPython/b.bat
index 22f0042c1e..69db82ec26 100755
--- a/wxPython/b.bat
+++ b/wxPython/b.bat
@@ -71,29 +71,19 @@ elseiff "%1" == "a" then
 	shift
 	set CMD=echo Finished!
 
-	call b.bat 15 c
-	call b.bat 15 f
-	cd demo
-	p15 encode_bitmaps.py
-	cd -
-	call b.bat 15 r
-	call b.bat 15 c
-	call b.bat 15 h
-	call b.bat 15 r
-
-	call b.bat 21 c
-	call b.bat 21 f
-	call b.bat 21 r
-	call b.bat 21 c
+	call b.bat 21 d
 	call b.bat 21 h
 	call b.bat 21 r
+	call b.bat 21 d UNICODE=1
+	call b.bat 21 h UNICODE=1
+	call b.bat 21 r UNICODE=1
 
-	call b.bat 22 c
-	call b.bat 22 f
-	call b.bat 22 r
-	call b.bat 22 c
+	call b.bat 22 d
 	call b.bat 22 h
 	call b.bat 22 r
+	call b.bat 22 d UNICODE=1
+	call b.bat 22 h UNICODE=1
+	call b.bat 22 r UNICODE=1
 
 
 rem "b" --> both debug and hybrid builds
diff --git a/wxPython/distrib/README.1st.txt b/wxPython/distrib/README.1st.txt
index 3ee37db4e7..f97ebfa0aa 100644
--- a/wxPython/distrib/README.1st.txt
+++ b/wxPython/distrib/README.1st.txt
@@ -30,24 +30,24 @@ Clear as mud?  Good.  Let's get started.
    you can use whatever you like.  I'll just set a variable to our wx
    prefix to reference later:
 
-	export WXPREF=/usr/lib/wxPython
+        export WXPREF=/usr/lib/wxPython
 
 
 2. Make a build directory and configure wxGTK.
 
-	cd wxPythonGTK-2.3.3   # or whatever the top-level dir is
-	mkdir build
-	cd build
-	../configure --with-gtk \
-		     --prefix=$WXPREF \
-		     --enable-rpath=$WXPREF/lib \
-		     --with-opengl \
-		     --enable-optimise \
-		     --enable-debug_flag \
-		     -with-libjpeg=builtin \
-		     --with-libpng=builtin \
-		     --with-libtiff=builtin \
-		     --with-zlib=builtin
+        cd wxPythonGTK-2.3.3   # or whatever the top-level dir is
+        mkdir build
+        cd build
+        ../configure --with-gtk \
+                     --prefix=$WXPREF \
+                     --enable-rpath=$WXPREF/lib \
+                     --with-opengl \
+                     --enable-optimise \
+                     --enable-debug_flag \
+                     --with-libjpeg=builtin \
+                     --with-libpng=builtin \
+                     --with-libtiff=builtin \
+                     --with-zlib=builtin
 
    You may want to use --enable-debug instead of --enable-optimise if
    you need to run though a debugger and want full debugging symbols.
@@ -56,11 +56,11 @@ Clear as mud?  Good.  Let's get started.
 3. Build and install wxGTK.  (You may need to be root for the last
    step, depending on where your WXPREF is.)
 
-	make
-	cd ../locale
-	make allmo
-	cd ../build
-	make install
+        make
+        cd ../locale
+        make allmo
+        cd ../build
+        make install
 
 4. Build and install wxPython.  If you want to use a different version
    of Python than is found by default on the PATH then specify the
@@ -69,10 +69,10 @@ Clear as mud?  Good.  Let's get started.
    (You will need to be root for the install step unless your Python
    is not in a system location.)
 
-	cd ../wxPython
-	python setup.py \
-	       IN_CVS_TREE=1 WX_CONFIG=$WXPREF/bin/wx-config \
-	       build install
+        cd ../wxPython
+        python setup.py \
+               IN_CVS_TREE=1 WX_CONFIG=$WXPREF/bin/wx-config \
+               build install
 
 5. That's all!
 
diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 3b77adba35..8151a7725f 100644
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -37,10 +37,10 @@ DirExistsWarning = no
 DisableReadyMemo = true
 DisableReadyPage = true
 ;;DisableDirPage = true
-DisableProgramGroupPage = true
+DisableProgramGroupPage = no
 DisableAppendDir = true
 UsePreviousAppDir = no
-UsePreviousGroup = no
+UsePreviousGroup = yes
 
 UninstallFilesDir = {app}\wxPython
 AppPublisherURL = http://wxPython.org/
diff --git a/wxPython/distrib/makedocs.bat b/wxPython/distrib/makedocs.bat
index 4e353fb32c..d3561b2689 100755
--- a/wxPython/distrib/makedocs.bat
+++ b/wxPython/distrib/makedocs.bat
@@ -17,8 +17,8 @@ copy wxPython-%1\docs\ogl\ogl.htm wxPython-%1\docs\ogl\index.htm
 
 rem **** zip up the docs
 rem zip -r ..\distrib\wxPython-docs-%1.zip wxPython-%1\docs
-tar cvf ..\dist\wxPythonDocs-%1.tar wxPython-%1
-gzip -9 ..\dist\wxPythonDocs-%1.tar
+tar cvf ../dist/wxPythonDocs-%1.tar wxPython-%1
+gzip -9 ../dist/wxPythonDocs-%1.tar
 
 
 rem **** Cleanup
diff --git a/wxPython/setup.py b/wxPython/setup.py
index f457eaaa10..47778ff0e9 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
 # flags and values that affect this script
 #----------------------------------------------------------------------
 
-VERSION          = "2.3.3.1"
+VERSION          = "2.3.3.2"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
diff --git a/wxPython/src/__version__.py b/wxPython/src/__version__.py
index 71ad13ae23..a3ad44740c 100644
--- a/wxPython/src/__version__.py
+++ b/wxPython/src/__version__.py
@@ -1 +1 @@
-ver = '2.3.3.1'
+ver = '2.3.3.2'