diff --git a/distrib/msw/dmc.rsp b/distrib/msw/dmc.rsp
new file mode 100644
index 0000000000..e7c9613afb
--- /dev/null
+++ b/distrib/msw/dmc.rsp
@@ -0,0 +1,140 @@
+build/msw/config.dmc
+build/msw/makefile.dmc
+contrib/build/animate/makefile.dmc
+contrib/build/deprecated/makefile.dmc
+contrib/build/fl/makefile.dmc
+contrib/build/gizmos/makefile.dmc
+contrib/build/mmedia/makefile.dmc
+contrib/build/net/makefile.dmc
+contrib/build/ogl/makefile.dmc
+contrib/build/plot/makefile.dmc
+contrib/build/stc/makefile.dmc
+contrib/build/svg/makefile.dmc
+contrib/build/xrc/makefile.dmc
+contrib/samples/animate/makefile.dmc
+contrib/samples/deprecated/proplist/makefile.dmc
+contrib/samples/deprecated/resource/makefile.dmc
+contrib/samples/deprecated/treelay/makefile.dmc
+contrib/samples/fl/makefile.dmc
+contrib/samples/gizmos/dynsash/makefile.dmc
+contrib/samples/gizmos/dynsash_switch/makefile.dmc
+contrib/samples/gizmos/editlbox/makefile.dmc
+contrib/samples/gizmos/led/makefile.dmc
+contrib/samples/gizmos/multicell/makefile.dmc
+contrib/samples/gizmos/splittree/makefile.dmc
+contrib/samples/mmedia/makefile.dmc
+contrib/samples/ogl/ogledit/makefile.dmc
+contrib/samples/ogl/studio/makefile.dmc
+contrib/samples/plot/makefile.dmc
+contrib/samples/stc/makefile.dmc
+contrib/samples/svg/makefile.dmc
+contrib/samples/xrc/makefile.dmc
+contrib/utils/convertrc/makefile.dmc
+contrib/utils/wxrc/makefile.dmc
+contrib/utils/wxrcedit/makefile.dmc
+demos/bombs/makefile.dmc
+demos/dbbrowse/makefile.dmc
+demos/forty/makefile.dmc
+demos/fractal/makefile.dmc
+demos/life/makefile.dmc
+demos/makefile.dmc
+demos/poem/makefile.dmc
+samples/access/makefile.dmc
+samples/artprov/makefile.dmc
+samples/calendar/makefile.dmc
+samples/caret/makefile.dmc
+samples/checklst/makefile.dmc
+samples/config/makefile.dmc
+samples/console/makefile.dmc
+samples/controls/makefile.dmc
+samples/db/makefile.dmc
+samples/dialogs/makefile.dmc
+samples/dialup/makefile.dmc
+samples/display/makefile.dmc
+samples/dnd/makefile.dmc
+samples/docview/makefile.dmc
+samples/docvwmdi/makefile.dmc
+samples/dragimag/makefile.dmc
+samples/drawing/makefile.dmc
+samples/dynamic/makefile.dmc
+samples/erase/makefile.dmc
+samples/event/makefile.dmc
+samples/except/makefile.dmc
+samples/exec/makefile.dmc
+samples/font/makefile.dmc
+samples/grid/makefile.dmc
+samples/help/makefile.dmc
+samples/htlbox/makefile.dmc
+samples/html/about/makefile.dmc
+samples/html/help/makefile.dmc
+samples/html/helpview/makefile.dmc
+samples/html/htmlctrl/makefile.dmc
+samples/html/makefile.dmc
+samples/html/printing/makefile.dmc
+samples/html/test/makefile.dmc
+samples/html/virtual/makefile.dmc
+samples/html/widget/makefile.dmc
+samples/html/zip/makefile.dmc
+samples/image/makefile.dmc
+samples/internat/makefile.dmc
+samples/ipc/makefile.dmc
+samples/joytest/makefile.dmc
+samples/keyboard/makefile.dmc
+samples/layout/makefile.dmc
+samples/listbox/makefile.dmc
+samples/listctrl/makefile.dmc
+samples/makefile.dmc
+samples/mdi/makefile.dmc
+samples/memcheck/makefile.dmc
+samples/menu/makefile.dmc
+samples/mfc/makefile.dmc
+samples/minifram/makefile.dmc
+samples/minimal/makefile.dmc
+samples/mobile/makefile.dmc
+samples/mobile/styles/makefile.dmc
+samples/mobile/wxedit/makefile.dmc
+samples/multimon/makefile.dmc
+samples/nativdlg/makefile.dmc
+samples/notebook/makefile.dmc
+samples/oleauto/makefile.dmc
+samples/opengl/cube/makefile.dmc
+samples/opengl/isosurf/makefile.dmc
+samples/opengl/makefile.dmc
+samples/opengl/penguin/makefile.dmc
+samples/ownerdrw/makefile.dmc
+samples/png/makefile.dmc
+samples/printing/makefile.dmc
+samples/propsize/makefile.dmc
+samples/regtest/makefile.dmc
+samples/render/makefile.dmc
+samples/richedit/makefile.dmc
+samples/rotate/makefile.dmc
+samples/rttitest/makefile.dmc
+samples/sashtest/makefile.dmc
+samples/scroll/makefile.dmc
+samples/scrollsub/makefile.dmc
+samples/shaped/makefile.dmc
+samples/sockets/makefile.dmc
+samples/sound/makefile.dmc
+samples/splitter/makefile.dmc
+samples/statbar/makefile.dmc
+samples/tab/makefile.dmc
+samples/taskbar/makefile.dmc
+samples/text/makefile.dmc
+samples/thread/makefile.dmc
+samples/toolbar/makefile.dmc
+samples/treectrl/makefile.dmc
+samples/typetest/makefile.dmc
+samples/validate/makefile.dmc
+samples/vscroll/makefile.dmc
+samples/widgets/makefile.dmc
+samples/wizard/makefile.dmc
+samples/wxtest/makefile.dmc
+tests/makefile.dmc
+utils/configtool/src/makefile.dmc
+utils/emulator/src/makefile.dmc
+utils/HelpGen/src/makefile.dmc
+utils/helpview/src/makefile.dmc
+utils/hhp2cached/makefile.dmc
+utils/makefile.dmc
+utils/tex2rtf/src/makefile.dmc
diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 5fcecc12ef..0f9adc93e4 100644
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -703,12 +703,20 @@ samples/internat/*.ico
 samples/internat/*.bmp
 samples/internat/*.mo
 samples/internat/*.pro
+samples/internat/bg/*.mo
+samples/internat/bg/*.po
+samples/internat/cs/*.mo
+samples/internat/cs/*.po
 samples/internat/fr/*.mo
 samples/internat/fr/*.po
 samples/internat/de/*.mo
 samples/internat/de/*.po
 samples/internat/ru/*.mo
 samples/internat/ru/*.po
+samples/internat/ja/*.mo
+samples/internat/ja/*.po
+samples/internat/ka/*.mo
+samples/internat/ka/*.po
 samples/internat/*.bkl
 
 samples/ipc/*.cpp
diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh
index a9db4dc09a..1ca873c6f9 100644
--- a/distrib/msw/makesetup.sh
+++ b/distrib/msw/makesetup.sh
@@ -206,6 +206,7 @@ dospinmsw()
 
     # Create wxWidgets-$VERSION-win.zip which is used to create wxMSW
     echo Zipping individual components
+    rm -f $DESTDIR/wxWidgets-$VERSION-win.zip
     zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/generic.rsp
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/makefile.rsp
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/msw.rsp
@@ -222,6 +223,7 @@ dospinmsw()
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utilmake.rsp
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/univ.rsp
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/wince.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/dmc.rsp
 
 #    rearchive wxWidgets-$VERSION-win.zip wxWidgets-$VERSION $DESTDIR
 
@@ -256,6 +258,7 @@ dospinwxall()
 
     # Create wxWidgets-$VERSION-win.zip which is used to create wxMSW
     echo Zipping individual components
+    rm -f $DESTDIR/wxWidgets-$VERSION-win.zip
     zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/generic.rsp
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/makefile.rsp
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/msw.rsp
@@ -272,6 +275,7 @@ dospinwxall()
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utilmake.rsp
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/univ.rsp
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/wince.rsp
+    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/dmc.rsp
 
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/x11.rsp
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/motif.rsp
@@ -298,7 +302,7 @@ dospinwxall()
 
     cd $DESTDIR
 
-    rm -f wxWidgets-$VERSION-win.zip
+    rm -f $DESTDIR/wxWidgets-$VERSION-win.zip
     zip $ZIPFLAGS -r wxWidgets-$VERSION-win.zip wxWidgets-$VERSION/*
 }
 
@@ -366,6 +370,11 @@ dospinmisc()
     zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-eVC.zip < $APPDIR/distrib/msw/wince.rsp
     # rearchive wxWidgets-$VERSION-eVC.zip wxWidgets-$VERSION $DESTDIR
 
+    # DMC project files
+    echo Creating $DESTDIR/wxWidgets-$VERSION-DMC.zip
+    zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-DMC.zip < $APPDIR/distrib/msw/dmc.rsp
+    # rearchive wxWidgets-$VERSION-DMC.zip wxWidgets-$VERSION $DESTDIR
+
     # BC++ project files
     echo Creating $DESTDIR/wxWidgets-$VERSION-BC.zip
     zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-BC.zip < $APPDIR/distrib/msw/bc.rsp
@@ -384,7 +393,7 @@ dospinsetup()
     # Put all archives for transit to Linux in a zip file
     echo Creating $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip
     rm -f $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip
-    zip $ZIPFLAGS $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip wxWidgets-$VERSION-LinuxDocs.zip wxWidgets-$VERSION-VC.zip wxWidgets-$VERSION-eVC.zip wxWidgets-$VERSION-CW-Mac.zip
+    zip $ZIPFLAGS $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip wxWidgets-$VERSION-LinuxDocs.zip wxWidgets-$VERSION-VC.zip wxWidgets-$VERSION-DMC.zip wxWidgets-$VERSION-eVC.zip wxWidgets-$VERSION-CW-Mac.zip
 
     echo Unzipping the Windows files into wxWidgets-$VERSION
 
diff --git a/distrib/msw/tarwxmac b/distrib/msw/tarwxmac
index ce9cc9291d..d7e4e6fb06 100755
--- a/distrib/msw/tarwxmac
+++ b/distrib/msw/tarwxmac
@@ -76,7 +76,7 @@ $TAR cf $2/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
 
 cat $1/distrib/msw/cw_mac.rsp > /tmp/wxmac_in.txt
 expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt
-$TAR cf $2/wxWidgets-CW-Mac-${WXVER}.tar -T /tmp/wxmac.txt
+$TAR cf $2/wxWidgets-${WXVER}-CW-Mac.tar -T /tmp/wxmac.txt
 
 rm -f $1/include/wx/setup.h
 
@@ -99,10 +99,10 @@ echo Re-tarring CW project files...
 cd $2
 mkdir wxWidgets-${WXVER}
 cd wxWidgets-${WXVER}
-$TAR xf $2/wxWidgets-CW-Mac-${WXVER}.tar
+$TAR xf $2/wxWidgets-${WXVER}-CW-Mac.tar
 cd ..
-rm -f wxWidgets-CW-Mac-${WXVER}.tar
-$TAR zcf wxWidgets-CW-Mac-${WXVER}.tar.gz wxWidgets-${WXVER}/*
+rm -f wxWidgets-${WXVER}-CW-Mac.tar
+$TAR zcf wxWidgets-${WXVER}-CW-Mac.tar.gz wxWidgets-${WXVER}/*
 
 # Copy readme and other files
 cp $1/docs/readme.txt $2/readme-${WXVER}.txt