diff --git a/distrib/msw/innobott.txt b/distrib/msw/innobott.txt
index 80d804066d..f1f5e91878 100644
--- a/distrib/msw/innobott.txt
+++ b/distrib/msw/innobott.txt
@@ -1,14 +1,12 @@
 
 [Icons]
-    Name: {group}\Dialog Editor; Filename: {app}\bin\dialoged.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\dialoged.exe; IconIndex: 0
-    Name: {group}\Dialog Editor Help; Filename: {app}\bin\dialoged.chm; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths
     Name: {group}\Tex2rtf; Filename: {app}\bin\tex2rtf.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\tex2rtf.exe; IconIndex: 0
     Name: {group}\Tex2rtf Help; Filename: {app}\bin\tex2rtf.chm; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths
     Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Compiling wxWindows; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\wxWindows Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
-    Name: {group}\Tutorial; Filename: {app}\docs\pdf\wxTutorial.pdf; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
+;    Name: {group}\Tutorial; Filename: {app}\docs\pdf\wxTutorial.pdf; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Document Index; Filename: {app}\docs\html\index.htm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
     Name: {group}\Widgets Sample; Filename: {app}\bin\widgets.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\widgets.exe; IconIndex: 0
 
diff --git a/distrib/msw/makeall.bat b/distrib/msw/makeall.bat
index ef0aa78564..31eabf2c83 100755
--- a/distrib/msw/makeall.bat
+++ b/distrib/msw/makeall.bat
@@ -97,7 +97,7 @@ Rem Euch, this is the only way I can think of right now
 Rem to copy them to the same directory. Daft but...
 erase %TEMP%\temp.zip
 zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\VC6Release
+unzip -o %TEMP%\temp.zip -d %BUILDDEST%\VC6Release
 nmake -f makefile.vc clean FINAL=1
 
 cd %WXDIR%\demos
@@ -106,7 +106,7 @@ nmake -f makefile.vc FINAL=1
 Rem Copy all executables to VC6Release
 erase %TEMP%\temp.zip
 zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\VC6Release
+unzip -o %TEMP%\temp.zip -d %BUILDDEST%\VC6Release
 nmake -f makefile.vc clean FINAL=1
 
 Rem Compile OGL
@@ -247,7 +247,7 @@ make -f makefile.b32 FINAL=1
 Rem Copy all executables to BC55Release
 erase %TEMP%\temp.zip
 zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\BC55Release
+unzip -o %TEMP%\temp.zip -d %BUILDDEST%\BC55Release
 make -f makefile.b32 clean FINAL=1
 
 cd %WXDIR%\demos
@@ -256,7 +256,7 @@ make -f makefile.b32 FINAL=1
 Rem Copy all executables to BC55Release
 erase %TEMP%\temp.zip
 zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\BC55Release
+unzip -o %TEMP%\temp.zip -d %BUILDDEST%\BC55Release
 make -f makefile.b32 clean FINAL=1
 
 Rem Compile OGL
@@ -379,7 +379,7 @@ make -f makefile.g95 FINAL=1
 Rem Copy all executables to Cygwin11Release
 erase %TEMP%\temp.zip
 zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Cygwin11Release
+unzip -o %TEMP%\temp.zip -d %BUILDDEST%\Cygwin11Release
 make -f makefile.g95 clean FINAL=1
 
 cd %WXDIR%\demos
@@ -388,7 +388,7 @@ make -f makefile.g95 FINAL=1
 Rem Copy all executables to Cygwin11Release
 erase %TEMP%\temp.zip
 zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Cygwin11Release
+unzip -o %TEMP%\temp.zip -d %BUILDDEST%\Cygwin11Release
 make -f makefile.g95 clean FINAL=1
 
 Rem Compile OGL
@@ -459,7 +459,7 @@ make -f makefile.g95 FINAL=1
 Rem Copy all executables to Ming2952Release
 erase %TEMP%\temp.zip
 zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Ming2952Release
+unzip -o %TEMP%\temp.zip -d %BUILDDEST%\Ming2952Release
 make -f makefile.g95 clean FINAL=1
 
 cd %WXDIR%\demos
@@ -468,7 +468,7 @@ make -f makefile.g95 FINAL=1
 Rem Copy all executables to Ming2952Release
 erase %TEMP%\temp.zip
 zip16 -r %TEMP%\temp.zip *.exe
-unzip32 -o %TEMP%\temp.zip -d %BUILDDEST%\Ming2952Release
+unzip -o %TEMP%\temp.zip -d %BUILDDEST%\Ming2952Release
 make -f makefile.g95 clean FINAL=1
 
 Rem Compile OGL
diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp
index a0b204a85e..44fc2e7002 100644
--- a/distrib/msw/msw.rsp
+++ b/distrib/msw/msw.rsp
@@ -6,6 +6,8 @@ lib/watcom/*.txt
 lib/watcom/*.lib
 lib/watcom/*.bat
 lib/bcc16/*.lib
+lib/_sc/*.txt
+lib/_sc/*.def
 
 docs/licence.txt
 docs/msw/*.txt
diff --git a/distrib/msw/rearchive.bat b/distrib/msw/rearchive.bat
index 22a19696db..a380cdaadf 100755
--- a/distrib/msw/rearchive.bat
+++ b/distrib/msw/rearchive.bat
@@ -17,10 +17,10 @@ pushd %changeto%
 if direxist %dirname% erase /sxyz %dirname%
 mkdir %dirname%
 cd %dirname%
-unzip32 ..\%archive%
+unzip ..\%archive%
 cd ..
 erase %archive%
-zip32 -r %archive% %dirname%/*
+zip -r %archive% %dirname%/*
 
 popd
 
diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index 93e1daebdf..afd34b8fa6 100755
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -62,28 +62,28 @@ cd %src%
 echo Zipping...
 
 Rem Zip up the complete wxOS2-xxx.zip file
-zip32 -@ %dest\wxOS2-%version%.zip < %src\distrib\msw\generic.rsp
-zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\os2.rsp
-zip32 -@ -u %dest%\wxOS2-%version%.zip  < %src\distrib\msw\jpeg.rsp
-zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\tiff.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tiff.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\jpeg.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\utils.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\dialoged.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\ogl.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\xml.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\contrib.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp
+zip -@ %dest\wxOS2-%version%.zip < %src\distrib\msw\generic.rsp
+zip -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\os2.rsp
+zip -@ -u %dest%\wxOS2-%version%.zip  < %src\distrib\msw\jpeg.rsp
+zip -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\tiff.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tiff.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\jpeg.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\utils.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\dialoged.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\ogl.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\xml.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\contrib.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp
 
 Rem Rearchive under wxWindows-%version%
 if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
 
 mkdir %dest%\wxWindows-%version%
 cd %dest%\wxWindows-%version%
-unzip32 ..\wxOS2-%version%.zip
+unzip ..\wxOS2-%version%.zip
 echo Overwriting with OS2-specific versions of configure files...
-unzip32 -o %src%\distrib\os2\os2-specific.zip
+unzip -o %src%\distrib\os2\os2-specific.zip
 erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
 erase /Y src\tiff\*.mcp src\jpeg\*.mcp src\png\*.mcp src\zlib\*.mcp
 erase /SXY docs\html\dialoged docs\html\tex2rtf
@@ -97,7 +97,7 @@ call %src%\distrib\msw\lower.bat
 cd %dest%
 
 erase wxOS2-%version%.zip
-zip32 -r wxOS2-%version%.zip wxWindows-%version%/*
+zip -r wxOS2-%version%.zip wxWindows-%version%/*
 
 cd %src%
 
@@ -105,21 +105,21 @@ echo Zipping wxMac distribution
 
 copy %src%\include\wx\mac\setup0.h %src%\include\wx\setup.h
 
-zip32 -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\generic.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\cw_mac.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tiff.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\jpeg.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\utils.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\dialoged.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\ogl.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\xml.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\stc.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\contrib.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
+zip -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\generic.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\cw_mac.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tiff.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\jpeg.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\utils.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\dialoged.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\ogl.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\xml.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\stc.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\contrib.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
 
-zip32 -@ %dest%\wxWindows-%version%-CW-Mac.zip < %src%\distrib\msw\cw_mac.rsp
+zip -@ %dest%\wxWindows-%version%-CW-Mac.zip < %src%\distrib\msw\cw_mac.rsp
 
 erase /Y %src%\include\wx\setup.h
 
@@ -127,105 +127,105 @@ if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
 
 mkdir %dest%\wxWindows-%version%
 cd %dest%\wxWindows-%version%
-unzip32 ..\wxMac-%version%.zip
+unzip ..\wxMac-%version%.zip
 erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
 erase /SXY docs\html\dialoged docs\html\tex2rtf docs\htmlhelp
 
 cd %dest%
 
 erase wxMac-%version%.zip
-zip32 -r wxMac-%version%.zip wxWindows-%version%/*
+zip -r wxMac-%version%.zip wxWindows-%version%/*
 
 cd %src%
 
 Rem Create wxWindows-%version%-win.zip which is used to create wxMSW
 echo Zipping individual components
-zip32 -@ %dest\wxWindows-%version%-win.zip < %src\distrib\msw\generic.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\makefile.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\msw.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\ogl.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\mmedia.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\stc.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\tex2rtf.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\jpeg.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\tiff.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\xml.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\contrib.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\dialoged.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utils.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utilmake.rsp
-zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\univ.rsp
+zip -@ %dest\wxWindows-%version%-win.zip < %src\distrib\msw\generic.rsp
+zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\makefile.rsp
+zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\msw.rsp
+zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\ogl.rsp
+zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\mmedia.rsp
+zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\stc.rsp
+zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\tex2rtf.rsp
+zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\jpeg.rsp
+zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\tiff.rsp
+zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\xml.rsp
+zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\contrib.rsp
+zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\dialoged.rsp
+zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utils.rsp
+zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utilmake.rsp
+zip -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\univ.rsp
 
 echo Re-archiving wxWindows-%version%-win.zip
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-win.zip wxWindows-%version% %dest%
 
 echo Removing .mms files
-zip32 -d %dest%\wxWindows-%version%-win.zip wxWindows-%version%/src/gtk/descrip.mms wxWindows-%version%/src/motif/descrip.mms
+zip -d %dest%\wxWindows-%version%-win.zip wxWindows-%version%/src/gtk/descrip.mms wxWindows-%version%/src/motif/descrip.mms
 
 echo Creating %dest\wxWindows-%version%-DocSource.zip
-zip32 -@ %dest\wxWindows-%version%-DocSource.zip < %src\distrib\msw\docsrc.rsp
+zip -@ %dest\wxWindows-%version%-DocSource.zip < %src\distrib\msw\docsrc.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-DocSource.zip wxWindows-%version% %dest%
 
 echo Creating %dest\wxWindows-%version%-WinHelp.zip
-zip32 -@ %dest\wxWindows-%version%-WinHelp.zip < %src\distrib\msw\wx_hlp.rsp
+zip -@ %dest\wxWindows-%version%-WinHelp.zip < %src\distrib\msw\wx_hlp.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-WinHelp.zip wxWindows-%version% %dest%
 
 echo Creating %dest\wxWindows-%version%-HTML.zip
-zip32 -@ %dest\wxWindows-%version%-HTML.zip < %src\distrib\msw\wx_html.rsp
+zip -@ %dest\wxWindows-%version%-HTML.zip < %src\distrib\msw\wx_html.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTML.zip wxWindows-%version% %dest%
 
 echo Creating %dest\wxWindows-%version%-PDF.zip
-zip32 -@ %dest\wxWindows-%version%-PDF.zip < %src\distrib\msw\wx_pdf.rsp
+zip -@ %dest\wxWindows-%version%-PDF.zip < %src\distrib\msw\wx_pdf.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-PDF.zip wxWindows-%version% %dest%
 
-Rem zip32 -@ %dest\wxWindows-%version%-Word.zip < %src\distrib\msw\wx_word.rsp
+Rem zip -@ %dest\wxWindows-%version%-Word.zip < %src\distrib\msw\wx_word.rsp
 Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Word.zip wxWindows-%version% %dest%
 
 echo Creating %dest\wxWindows-%version%-HTB.zip
-zip32 -@ %dest\wxWindows-%version%-HTB.zip < %src\distrib\msw\wx_htb.rsp
+zip -@ %dest\wxWindows-%version%-HTB.zip < %src\distrib\msw\wx_htb.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTB.zip wxWindows-%version% %dest%
 
 echo Creating %dest\wxWindows-%version%-HTMLHelp.zip
-zip32 -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp
+zip -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTMLHelp.zip wxWindows-%version% %dest%
 
 Rem Add Linuxy docs to a separate archive to be transported to Linux for the
 Rem Linux-based releases
 echo Creating %dest\wxWindows-%version%-LinuxDocs.zip
-zip32 -@ %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_html.rsp
-zip32 -@ -u %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_pdf.rsp
-zip32 -@ -u %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_htb.rsp
+zip -@ %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_html.rsp
+zip -@ -u %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_pdf.rsp
+zip -@ -u %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_htb.rsp
 
 Rem PDF/HTML docs that should go into the Windows setup because
 Rem there are no WinHelp equivalents
 echo Creating %dest\wxWindows-%version%-ExtraDoc.zip
-zip32 -@ %dest\wxWindows-%version%-ExtraDoc.zip < %src\distrib\msw\extradoc.rsp
+zip -@ %dest\wxWindows-%version%-ExtraDoc.zip < %src\distrib\msw\extradoc.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-ExtraDoc.zip wxWindows-%version% %dest%
 
 Rem zip up Univ-specific files
 echo Creating %dest\wxWindows-%version%-Univ.zip
-zip32 -@ %dest\wxWindows-%version%-Univ.zip < %src\distrib\msw\univ.rsp
+zip -@ %dest\wxWindows-%version%-Univ.zip < %src\distrib\msw\univ.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Univ.zip wxWindows-%version% %dest%
 
 rem VC++ project files
 echo Creating %dest\wxWindows-%version%-VC.zip
-zip32 -@ %dest\wxWindows-%version%-VC.zip < %src\distrib\msw\vc.rsp
+zip -@ %dest\wxWindows-%version%-VC.zip < %src\distrib\msw\vc.rsp
 Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-VC.zip wxWindows-%version% %dest%
 
 rem BC++ project files
 echo Creating %dest\wxWindows-%version%-BC.zip
-zip32 -@ %dest\wxWindows-%version%-BC.zip < %src\distrib\msw\bc.rsp
+zip -@ %dest\wxWindows-%version%-BC.zip < %src\distrib\msw\bc.rsp
 Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-BC.zip wxWindows-%version% %dest%
 
 rem CodeWarrior project files
 echo Creating %dest\wxWindows-%version%-CW.zip
-zip32 -@ %dest\wxWindows-%version%-CW.zip < %src\distrib\msw\cw.rsp
+zip -@ %dest\wxWindows-%version%-CW.zip < %src\distrib\msw\cw.rsp
 Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-CW.zip wxWindows-%version% %dest%
 
 rem Dialog Editor source and binary
 Rem erase %dest\dialoged-source.zip
-Rem zip32 -@ %dest\dialoged-source.zip < %src\distrib\msw\dialoged.rsp
-Rem zip32 -j %dest\dialoged-%version%.zip %dest\dialoged-source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
+Rem zip -@ %dest\dialoged-source.zip < %src\distrib\msw\dialoged.rsp
+Rem zip -j %dest\dialoged-%version%.zip %dest\dialoged-source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
 Rem erase %dest\dialoged-source.zip
 
 copy %src\docs\changes.txt %dest\changes-%version%.txt
@@ -256,27 +256,27 @@ if "%inno" == "0" goto end
 Rem Make dialoged-win32.zip and tex2rtf-win32.zip
 
 Rem cd %src\bin
-Rem zip32 %dest\dialoged-win32-%version%.zip dialoged.*
-Rem zip32 %dest\tex2rtf-win32-%version%.zip tex2rtf.*
+Rem zip %dest\dialoged-win32-%version%.zip dialoged.*
+Rem zip %dest\tex2rtf-win32-%version%.zip tex2rtf.*
 
 cd %dest
 
 rem Put all archives for transit to Linux in a zip file
 echo Creating %dest\wxWindows-%version%-LinuxTransit.zip
 erase %dest\wxWindows-%version%-LinuxTransit.zip
-zip32 %dest\wxWindows-%version%-LinuxTransit.zip wxWindows-%version%-LinuxDocs.zip wxWindows-%version%-VC.zip wxWindows-%version%-CW-Mac.zip
+zip %dest\wxWindows-%version%-LinuxTransit.zip wxWindows-%version%-LinuxDocs.zip wxWindows-%version%-VC.zip wxWindows-%version%-CW-Mac.zip
 
 echo Unzipping the Windows files into wxWindows-%version%
 
-unzip32 -o wxWindows-%version%-win.zip
-unzip32 -o wxWindows-%version%-VC.zip -d wxWindows-%version
-unzip32 -o wxWindows-%version%-BC.zip -d wxWindows-%version
-unzip32 -o wxWindows-%version%-CW.zip -d wxWindows-%version
-unzip32 -o wxWindows-%version%-HTMLHelp.zip
-unzip32 -o wxWindows-%version%-ExtraDoc.zip
+unzip -o wxWindows-%version%-win.zip
+unzip -o wxWindows-%version%-VC.zip -d wxWindows-%version
+unzip -o wxWindows-%version%-BC.zip -d wxWindows-%version
+unzip -o wxWindows-%version%-CW.zip -d wxWindows-%version
+unzip -o wxWindows-%version%-HTMLHelp.zip
+unzip -o wxWindows-%version%-ExtraDoc.zip
 Rem Need Word file, for Remstar DB classes
 Rem Not any more
-Rem unzip32 -o wxWindows-%version%-Word.zip
+Rem unzip -o wxWindows-%version%-Word.zip
 
 Rem After this change of directory, we're in the
 Rem temporary 'wx' directory and not acting on
@@ -299,27 +299,27 @@ erase /Y distrib
 
 rem Now copy some binary files to 'bin'
 if not isdir bin mkdir bin
-copy %src\bin\dialoged.exe bin
-copy %src\bin\dialoged.hlp bin
-copy %src\bin\dialoged.chm bin
+Rem copy %src\bin\dialoged.exe bin
+Rem copy %src\bin\dialoged.hlp bin
+Rem copy %src\bin\dialoged.chm bin
 copy %src\bin\tex2rtf.exe bin
 copy %src\bin\tex2rtf.hlp bin
 copy %src\bin\tex2rtf.cnt bin
-copy %src\bin\dbgview.* bin
+Rem copy %src\bin\dbgview.* bin
 copy %src\bin\widgets.exe bin
 copy %src\bin\widgets.exe.manifest bin
 copy %src\bin\life.exe bin
 copy %src\bin\life.exe.manifest bin
 copy %src\demos\life\breeder.lif bin
-copy %src\docs\htmlhelp\dialoged.chm bin
+Rem copy %src\docs\htmlhelp\dialoged.chm bin
 copy %src\docs\htmlhelp\tex2rtf.chm bin
 
 if not direxist docs\pdf mkdir docs\pdf
-copy %src\docs\pdf\wxTutorial.pdf docs\pdf
+Rem copy %src\docs\pdf\wxTutorial.pdf docs\pdf
 
 Rem Make wxMSW-xxx.zip
 cd %dest%
-zip32 -r wxMSW-%version%.zip wxWindows-%version%/*
+zip -r wxMSW-%version%.zip wxWindows-%version%/*
 cd wxWindows-%version%
 
 echo Calling 'makeinno' to generate wxwin2.iss...
@@ -337,7 +337,7 @@ Rem pause Press any key to continue with the wxWindows distribution...
 cd %dest
 
 rem Put all the setup files into a single zip archive.
-zip32 wxMSW-%version%-setup.zip readme-%version%.txt setup*.*
+zip wxMSW-%version%-setup.zip readme-%version%.txt setup*.*
 
 erase /Y wxWindows-%version%-win.zip
 erase /Y wxWindows-%version%-ExtraDoc.zip
diff --git a/distrib/msw/zippatch.bat b/distrib/msw/zippatch.bat
index ef6cd9491c..a40efd40f2 100755
--- a/distrib/msw/zippatch.bat
+++ b/distrib/msw/zippatch.bat
@@ -26,7 +26,7 @@ erase /Q /E %dest%\wxWindows-*-patch*.zip
 cd %src%
 echo Zipping...
 
-zip32 -@ %dest%\%patchname% < %src%\distrib\msw\patch.rsp
+zip -@ %dest%\%patchname% < %src%\distrib\msw\patch.rsp
 echo wxWindows patch archived.
 
 cd %dest
diff --git a/distrib/msw/zipstc.bat b/distrib/msw/zipstc.bat
index 6110b39922..2695b56c87 100755
--- a/distrib/msw/zipstc.bat
+++ b/distrib/msw/zipstc.bat
@@ -13,7 +13,7 @@ inkey /W4 `Press any key to continue...` %%input
 
 erase %dest\stc.zip
 cd %src
-zip32 -@ %dest\stc.zip < %src\distrib\msw\stc.rsp
+zip -@ %dest\stc.zip < %src\distrib\msw\stc.rsp
 
 cd %dest
 
diff --git a/distrib/msw/zipwxmac.bat b/distrib/msw/zipwxmac.bat
index 472d01ccd4..db27807e05 100755
--- a/distrib/msw/zipwxmac.bat
+++ b/distrib/msw/zipwxmac.bat
@@ -31,19 +31,19 @@ echo Zipping wxMac distribution
 cd %src%
 copy %src%\include\wx\mac\setup0.h %src%\include\wx\setup.h
 
-zip32 -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\generic.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\cw_mac.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tiff.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\jpeg.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\utils.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\dialoged.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\ogl.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\xml.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\stc.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\contrib.rsp
-zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
+zip -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\generic.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\cw_mac.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tiff.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\jpeg.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\utils.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\dialoged.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\ogl.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\xml.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\stc.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\contrib.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
 
 erase /Y %src%\include\wx\setup.h
 
@@ -51,14 +51,14 @@ if direxist %dest%\wxMac-%version% erase /sxyz %dest%\wxMac-%version%
 
 mkdir %dest%\wxMac-%version%
 cd %dest%\wxMac-%version%
-unzip32 ..\wxMac-%version%.zip
+unzip ..\wxMac-%version%.zip
 erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
 erase /SXY docs\html\dialoged docs\html\tex2rtf
 
 cd %dest%
 
 erase wxMac-%version%.zip
-zip32 -r wxMac-%version%.zip wxMac-%version%/*
+zip -r wxMac-%version%.zip wxMac-%version%/*
 
 erase /sxyz %dest%\wxMac-%version%
 
diff --git a/distrib/msw/zipwxos2.bat b/distrib/msw/zipwxos2.bat
index 079245d0ff..82a6b230c1 100755
--- a/distrib/msw/zipwxos2.bat
+++ b/distrib/msw/zipwxos2.bat
@@ -28,19 +28,19 @@ echo Zipping wxOS2 distribution
 cd %src%
 Rem copy %src%\include\wx\os2\setup0.h %src%\include\wx\setup.h
 
-zip32 -@ %dest\wxOS2-%version%.zip < %src\distrib\msw\generic.rsp
-zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\os2.rsp
-zip32 -@ -u %dest%\wxOS2-%version%.zip  < %src\distrib\msw\jpeg.rsp
-zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\tiff.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tiff.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\jpeg.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\utils.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\dialoged.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\ogl.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\xml.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\contrib.rsp
-zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp
+zip -@ %dest\wxOS2-%version%.zip < %src\distrib\msw\generic.rsp
+zip -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\os2.rsp
+zip -@ -u %dest%\wxOS2-%version%.zip  < %src\distrib\msw\jpeg.rsp
+zip -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\tiff.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tiff.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\jpeg.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\utils.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\dialoged.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\ogl.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\xml.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\contrib.rsp
+zip -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp
 
 Rem erase /Y %src%\include\wx\setup.h
 
@@ -48,9 +48,9 @@ if direxist %dest%\wxOS2-%version% erase /sxyz %dest%\wxOS2-%version%
 
 mkdir %dest%\wxOS2-%version%
 cd %dest%\wxOS2-%version%
-unzip32 ..\wxOS2-%version%.zip
+unzip ..\wxOS2-%version%.zip
 echo Overwriting with OS2-specific versions of configure files...
-unzip32 -o %src%\distrib\os2\os2-specific.zip
+unzip -o %src%\distrib\os2\os2-specific.zip
 erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
 erase /Y src\tiff\*.mcp src\jpeg\*.mcp src\png\*.mcp src\zlib\*.mcp
 erase /SXY docs\html\dialoged docs\html\tex2rtf
@@ -64,7 +64,7 @@ call %src%\distrib\msw\lower.bat
 cd %dest%
 
 erase wxOS2-%version%.zip
-zip32 -r wxOS2-%version%.zip wxOS2-%version%/*
+zip -r wxOS2-%version%.zip wxOS2-%version%/*
 erase /sxyz wxOS2-%version%
 
 echo wxOS2 archived.
diff --git a/distrib/msw/zipxml.bat b/distrib/msw/zipxml.bat
index fe2d7ee5c6..618ecdd462 100755
--- a/distrib/msw/zipxml.bat
+++ b/distrib/msw/zipxml.bat
@@ -13,7 +13,7 @@ inkey /W4 `Press any key to continue...` %%input
 
 erase %dest\xml.zip
 cd %src
-zip32 -@ %dest\xml.zip < %src\distrib\msw\xml.rsp
+zip -@ %dest\xml.zip < %src\distrib\msw\xml.rsp
 
 cd %dest