diff --git a/distrib/msw/innobott.txt b/distrib/msw/innobott.txt
index 8a25fe1a4e..215c8ec6d3 100644
--- a/distrib/msw/innobott.txt
+++ b/distrib/msw/innobott.txt
@@ -36,6 +36,6 @@
 ;InnoVer=1.3
 ;AddVerTo=AppVerName
 ;SetupFilename=setup.exe
-;OutputFolder=C:\wx2dev\wxWindows\deliver
+;OutputFolder=C:\wx24\wxWindows\deliver
 ;CopyrightText=Copyright © The wxWindows Team
 
diff --git a/distrib/msw/innotop.txt b/distrib/msw/innotop.txt
index a8f8486bf1..526c9de73f 100644
--- a/distrib/msw/innotop.txt
+++ b/distrib/msw/innotop.txt
@@ -32,15 +32,15 @@
     Uninstallable=1
     DefaultDirName=c:\wxWindows_2.3.4
     DefaultGroupName=wxWindows 2.3.4
-    LicenseFile=C:\wx2dev\wxWindows\docs\licence.txt
-    InfoBeforeFile=C:\wx2dev\wxWindows\docs\readme.txt
-    InfoAfterFile=C:\wx2dev\wxWindows\docs\msw\install.txt
+    LicenseFile=C:\wx24\wxWindows\docs\licence.txt
+    InfoBeforeFile=C:\wx24\wxWindows\docs\readme.txt
+    InfoAfterFile=C:\wx24\wxWindows\docs\msw\install.txt
     MessagesFile=compiler:default.isl
     DiskSpanning=1
     DiskSize=1457664
     DiskClusterSize=512
     ReserveBytes=0
     UseSetupLdr=1
-    SourceDir=c:\wx2dev\wxWindows\deliver\wxWindows-2.3.4
-    OutputDir=c:\wx2dev\wxWindows\deliver
+    SourceDir=c:\wx24\wxWindows\deliver\wxWindows-2.3.4
+    OutputDir=c:\wx24\wxWindows\deliver
 
diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index 4093e66f17..05fc850009 100644
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -67,6 +67,7 @@ rm -f $2/wx*-${WXVER}*.tar.gz
 # Copy setup files
 cp $1/include/wx/os2/SETUP0.H $1/include/wx/os2/setup.h
 cp $1/include/wx/msw/setup0.h $1/include/wx/msw/setup.h
+cp $1/include/wx/univ/setup0.h $1/include/wx/univ/setup.h
 
 echo Tarring...
 
@@ -85,13 +86,13 @@ $TAR cf $2/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt
 
 echo Re-tarring wxGTK in a subdirectory...
 cd $2
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
+mkdir wxGTK-${WXVER}
+cd wxGTK-${WXVER}
 $TAR xf ../wxGTK-${WXVER}.tar
 cd ..
 rm -f wxGTK-${WXVER}.tar
-$TAR cf $2/wxGTK-${WXVER}.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
+$TAR cf $2/wxGTK-${WXVER}.tar wxGTK-${WXVER}/*
+rm -f -r wxGTK-${WXVER}
 gzip $2/wxGTK-${WXVER}.tar
 
 ### wxMotif
@@ -102,13 +103,13 @@ $TAR cf $2/wxMotif-${WXVER}.tar -T /tmp/wxmotif.txt
 
 echo Re-tarring wxMotif in a subdirectory...
 cd $2
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
+mkdir wxMotif-${WXVER}
+cd wxMotif-${WXVER}
 $TAR xf ../wxMotif-${WXVER}.tar
 cd ..
 rm -f wxMotif-${WXVER}.tar
-$TAR cf $2/wxMotif-${WXVER}.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
+$TAR cf $2/wxMotif-${WXVER}.tar wxMotif-${WXVER}/*
+rm -f -r wxMotif-${WXVER}
 gzip $2/wxMotif-${WXVER}.tar
 
 ### wxX11: combined wxMotif and wxX11 distributions
@@ -119,13 +120,13 @@ $TAR cf $2/wxX11-${WXVER}.tar -T /tmp/wxx11.txt
 
 echo Re-tarring wxX11 in a subdirectory...
 cd $2
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
+mkdir wxX11-${WXVER}
+cd wxX11-${WXVER}
 $TAR xf ../wxX11-${WXVER}.tar
 cd ..
 rm -f wxX11-${WXVER}.tar
-$TAR cf $2/wxX11-${WXVER}.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
+$TAR cf $2/wxX11-${WXVER}.tar wxX11-${WXVER}/*
+rm -f -r wxX11-${WXVER}
 gzip $2/wxX11-${WXVER}.tar
 
 ### wxMSW
@@ -146,32 +147,32 @@ rm -f $1/include/wx/setup.h
 
 echo Re-tarring wxMac in a subdirectory...
 cd $2
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
+mkdir wxMac-${WXVER}
+cd wxMac-${WXVER}
 $TAR xf ../wxMac-${WXVER}.tar
 rm -f -r contrib/src/mmedia contrib/samples/mmedia
 cd ..
 rm -f wxMac-${WXVER}.tar
-$TAR cf $2/wxMac-${WXVER}.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
+$TAR cf $2/wxMac-${WXVER}.tar wxMac-${WXVER}/*
+rm -f -r wxMac-${WXVER}
 gzip $2/wxMac-${WXVER}.tar
 
 ### wxUniv: universal-specific files
-cd $1
-cat $1/distrib/msw/univ.rsp > /tmp/wxuniv_in.txt
-expandlines /tmp/wxuniv_in.txt /tmp/wxuniv.txt
-$TAR cf $2/wxWindows-${WXVER}-Univ.tar -T /tmp/wxuniv.txt
-
-echo Re-tarring wxUniversal in a subdirectory...
-cd $2
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
-$TAR xf ../wxWindows-${WXVER}-Univ.tar
-cd ..
-rm -f wxWindows-${WXVER}-Univ.tar
-$TAR cf $2/wxWindows-${WXVER}-Univ.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $2/wxWindows-${WXVER}-Univ.tar
+#cd $1
+#cat $1/distrib/msw/univ.rsp > /tmp/wxuniv_in.txt
+#expandlines /tmp/wxuniv_in.txt /tmp/wxuniv.txt
+#$TAR cf $2/wxWindows-${WXVER}-Univ.tar -T /tmp/wxuniv.txt
+#
+#echo Re-tarring wxUniversal in a subdirectory...
+#cd $2
+#mkdir wxWindows-${WXVER}
+#cd wxWindows-${WXVER}
+#$TAR xf ../wxWindows-${WXVER}-Univ.tar
+#cd ..
+#rm -f wxWindows-${WXVER}-Univ.tar
+#$TAR cf $2/wxWindows-${WXVER}-Univ.tar wxWindows-${WXVER}/*
+#rm -f -r wxWindows-${WXVER}
+#gzip $2/wxWindows-${WXVER}-Univ.tar
 
 ### wxAll: all distributions in one giant archive
 cd $1
diff --git a/distrib/msw/tarwxall b/distrib/msw/tarwxall
index a6cecb08d8..b38bddd888 100755
--- a/distrib/msw/tarwxall
+++ b/distrib/msw/tarwxall
@@ -103,6 +103,7 @@ $1/distrib/msw/namedown include/wx/os2/*.H
 $1/distrib/msw/namedown src/os2/*.CPP src/os2/*.I
 
 cd ..
+
 rm -f wxAll-${WXVER}.tar
 $TAR cf $2/wxAll-${WXVER}.tar wxWindows-${WXVER}/*
 rm -f -r wxWindows-${WXVER}
diff --git a/distrib/msw/tarwxmac b/distrib/msw/tarwxmac
index d4b27af39e..1e2b159d1c 100755
--- a/distrib/msw/tarwxmac
+++ b/distrib/msw/tarwxmac
@@ -63,7 +63,7 @@ echo Removing backup files...
 rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
 
 rm -f $2/wxMac-${WXVER}*.tar.gz
-rm -f -r $2/wxWindows-${WXVER}
+rm -f -r $2/wxMac-${WXVER}
 
 cp $1/include/wx/mac/setup0.h $1/include/wx/setup.h
 
@@ -78,8 +78,8 @@ rm -f $1/include/wx/setup.h
 
 echo Re-tarring in a subdirectory...
 cd $2
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
+mkdir wxMac-${WXVER}
+cd wxMac-${WXVER}
 $TAR xf ../wxMac-${WXVER}.tar
 
 # Remove mmedia
@@ -87,8 +87,8 @@ rm -f -r contrib/src/mmedia contrib/samples/mmedia
 cd ..
 rm -f wxMac-${WXVER}.tar
 
-$TAR cf $2/wxMac-${WXVER}.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
+$TAR cf $2/wxMac-${WXVER}.tar wxMac-${WXVER}/*
+rm -f -r wxMac-${WXVER}
 gzip $2/wxMac-${WXVER}.tar
 
 # Copy readme and other files
diff --git a/distrib/msw/tarwxx11 b/distrib/msw/tarwxx11
index 5745a29b5f..065f67c0d4 100755
--- a/distrib/msw/tarwxx11
+++ b/distrib/msw/tarwxx11
@@ -63,7 +63,7 @@ echo Removing backup files...
 rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
 
 rm -f $2/wxX11-${WXVER}*.tar.gz
-rm -f $2/wxWindows-${WXVER}
+rm -f $2/wxX11-${WXVER}
 
 ### wxX11: combined wxMotif and wxX11 distributions
 cd $1
@@ -73,13 +73,13 @@ $TAR cf $2/wxX11-${WXVER}.tar -T /tmp/wxx11.txt
 
 echo Re-tarring wxX11 in a subdirectory...
 cd $2
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
+mkdir wxX11-${WXVER}
+cd wxX11-${WXVER}
 $TAR xf ../wxX11-${WXVER}.tar
 cd ..
 rm -f wxX11-${WXVER}.tar
-$TAR cf $2/wxX11-${WXVER}.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
+$TAR cf $2/wxX11-${WXVER}.tar wxX11-${WXVER}/*
+rm -f -r wxX11-${WXVER}
 gzip $2/wxX11-${WXVER}.tar
 
 
diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index 940fdff5ba..42254c1616 100644
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -285,6 +285,8 @@ utils/helpgen/src/HelpGenVC.dsw
 
 utils/helpview/src/helpview.dsp
 utils/helpview/src/helpview.dsw
+utils/helpview/src/client.dsp
+utils/helpview/src/client.dsw
 
 contrib/src/ogl/OglVC.dsp
 contrib/src/ogl/OglVC.dsw
diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index 80b83340c6..2cdf280f57 100755
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -45,7 +45,7 @@ if direxist %dest\wx erase /sxyz %dest\wx\
 if not direxist %dest mkdir %dest
 if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
 
-# Copy FAQ from wxWebSite CVS
+Rem Copy FAQ from wxWebSite CVS
 if not direxist %webfiles% echo Error - %webfiles% does not exist
 if not direxist %webfiles% goto end
 echo Copying FAQ and other files from %webfiles
@@ -56,6 +56,7 @@ copy %webfiles%\site\i18n.htm %src\docs\html
 Rem Copy setup0.h files to setup.h
 copy %src%\include\wx\os2\setup0.h %src%\include\wx\os2\setup.h
 copy %src%\include\wx\msw\setup0.h %src%\include\wx\msw\setup.h
+copy %src%\include\wx\univ\setup0.h %src%\include\wx\univ\setup.h
 
 cd %src%
 echo Zipping...
diff --git a/distrib/msw/zipwxmac.bat b/distrib/msw/zipwxmac.bat
index 2ae9621a16..472d01ccd4 100755
--- a/distrib/msw/zipwxmac.bat
+++ b/distrib/msw/zipwxmac.bat
@@ -7,7 +7,7 @@ set webfiles=c:\wx2dev\wxWebSite
 set stuffit="c:\Program Files\Aladdin Systems\StuffIt 7.5\StuffIt.exe"
 
 Rem Set this to the required version
-set version=2.3.3
+set version=2.3.4
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
@@ -47,10 +47,10 @@ zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
 
 erase /Y %src%\include\wx\setup.h
 
-if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
+if direxist %dest%\wxMac-%version% erase /sxyz %dest%\wxMac-%version%
 
-mkdir %dest%\wxWindows-%version%
-cd %dest%\wxWindows-%version%
+mkdir %dest%\wxMac-%version%
+cd %dest%\wxMac-%version%
 unzip32 ..\wxMac-%version%.zip
 erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
 erase /SXY docs\html\dialoged docs\html\tex2rtf
@@ -58,7 +58,9 @@ erase /SXY docs\html\dialoged docs\html\tex2rtf
 cd %dest%
 
 erase wxMac-%version%.zip
-zip32 -r wxMac-%version%.zip wxWindows-%version%/*
+zip32 -r wxMac-%version%.zip wxMac-%version%/*
+
+erase /sxyz %dest%\wxMac-%version%
 
 Rem echo Making StuffIt archive...
 Rem set stuffitcmd=%stuffit% -stuff -create wxMac-%version%.sit wxWindows-%version%\*
diff --git a/distrib/msw/zipwxos2.bat b/distrib/msw/zipwxos2.bat
index 5aeb6a40da..079245d0ff 100755
--- a/distrib/msw/zipwxos2.bat
+++ b/distrib/msw/zipwxos2.bat
@@ -5,7 +5,7 @@ set dest=%src\deliver
 set webfiles=c:\wx2dev\wxWebSite
 
 Rem Set this to the required version
-set version=2.3.3
+set version=2.3.4
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
@@ -44,10 +44,10 @@ zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp
 
 Rem erase /Y %src%\include\wx\setup.h
 
-if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
+if direxist %dest%\wxOS2-%version% erase /sxyz %dest%\wxOS2-%version%
 
-mkdir %dest%\wxWindows-%version%
-cd %dest%\wxWindows-%version%
+mkdir %dest%\wxOS2-%version%
+cd %dest%\wxOS2-%version%
 unzip32 ..\wxOS2-%version%.zip
 echo Overwriting with OS2-specific versions of configure files...
 unzip32 -o %src%\distrib\os2\os2-specific.zip
@@ -64,7 +64,8 @@ call %src%\distrib\msw\lower.bat
 cd %dest%
 
 erase wxOS2-%version%.zip
-zip32 -r wxOS2-%version%.zip wxWindows-%version%/*
+zip32 -r wxOS2-%version%.zip wxOS2-%version%/*
+erase /sxyz wxOS2-%version%
 
 echo wxOS2 archived.