diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 30d1095f0b..b39b40ba85 100644
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -39,6 +39,7 @@ locale/*.po
 locale/*.mo
 
 docs/readme.txt
+docs/readme_vms.txt
 docs/install.txt
 docs/release.txt
 docs/changes.txt
diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index a25712dcd6..9013dba06a 100644
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -17,9 +17,19 @@ samples/drawing/Makefile.in
 samples/dynamic/Makefile.in
 samples/exec/Makefile.in
 samples/genvalid/Makefile.in
+samples/grid/Makefile.in
+samples/newgrid/Makefile.in
+samples/help/Makefile.in
+samples/internat/Makefile.in
+samples/ipc/Makefile.in
+samples/png/Makefile.in
+samples/richedit/Makefile.in
+samples/resource/Makefile.in
+samples/sockets/Makefile.in
 samples/html/Makefile.in
 samples/html/about/Makefile.in
 samples/html/help/Makefile.in
+samples/html/helpview/Makefile.in
 samples/html/printing/Makefile.in
 samples/html/test/Makefile.in
 samples/html/virtual/Makefile.in
@@ -59,11 +69,13 @@ samples/opengl/Makefile.in
 samples/opengl/cube/Makefile.in
 samples/opengl/penguin/Makefile.in
 samples/opengl/isosurf/Makefile.in
+demos/Makefile.in
 demos/bombs/Makefile.in
 demos/forty/Makefile.in
 demos/fractal/Makefile.in
 demos/poem/Makefile.in
 demos/life/Makefile.in
+demos/dbbrowse/Makefile.in
 utils/dialoged/Makefile.in
 utils/dialoged/src/Makefile.in
 utils/Makefile.in
@@ -81,26 +93,23 @@ contrib/samples/mmedia/Makefile.in
 contrib/samples/stc/Makefile.in
 
 descrip.mms
-lib\vms.opt
-lib\vms_gtk.opt
-contrib\samples\mmedia\descrip.mms
-deliver\wx\src\common\descrip.mms
-deliver\wx\src\png\scripts\descrip.mms
-deliver\wx\src\zlib\descrip.mms
-demos\bombs\descrip.mms
-samples\caret\descrip.mms
-samples\checklst\descrip.mms
-samples\config\descrip.mms
-samples\controls\descrip.mms
-samples\dialogs\descrip.mms
-samples\image\descrip.mms
-samples\menu\descrip.mms
-samples\minimal\descrip.mms
-src\common\descrip.mms
-src\generic\descrip.mms
-src\gtk\descrip.mms
-src\motif\descrip.mms
-src\png\scripts\descrip.mms
-src\unix\descrip.mms
-src\zlib\descrip.mms
-utils\dialoged\src\descrip.mms
+lib/vms.opt
+lib/vms_gtk.opt
+contrib/samples/mmedia/descrip.mms
+demos/bombs/descrip.mms
+samples/caret/descrip.mms
+samples/checklst/descrip.mms
+samples/config/descrip.mms
+samples/controls/descrip.mms
+samples/dialogs/descrip.mms
+samples/image/descrip.mms
+samples/menu/descrip.mms
+samples/minimal/descrip.mms
+src/common/descrip.mms
+src/generic/descrip.mms
+src/gtk/descrip.mms
+src/motif/descrip.mms
+src/png/scripts/descrip.mms
+src/unix/descrip.mms
+src/zlib/descrip.mms
+utils/dialoged/src/descrip.mms
diff --git a/distrib/msw/tarwxmotif b/distrib/msw/tarwxmotif
index 9180511448..8dbb396864 100644
--- a/distrib/msw/tarwxmotif
+++ b/distrib/msw/tarwxmotif
@@ -25,6 +25,9 @@ cd $1
 echo Removing backup files...
 rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
 
+echo Setting permissions...
+chmod a+x $1/configure $1/config.sub $1/config.guess $1/samples/configure $1/demos/configure $1/contrib/configure
+
 rm -f $2/wxMotif-${WXVER}*.tgz
 rm -f $2/wxWindows*.tgz
 rm -f $2/tex2rtf2.tgz
@@ -35,28 +38,28 @@ rm -f $2/tiff.tgz
 echo Tarring...
 
 ### wxMotif
-ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/jpeg.rsp $1/distrib/msw/tiff.rsp` > /tmp/wxmotif.txt
+ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/utilmake.rsp $1/distrib/msw/jpeg.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/wx_html.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/utils.rsp` > /tmp/wxmotif.txt
 tar cvf $2/wxMotif-${WXVER}.tar -T /tmp/wxmotif.txt
 gzip $2/wxMotif-${WXVER}.tar
 mv $2/wxMotif-${WXVER}.tar.gz $2/wxMotif-${WXVER}.tgz
 
 ### HTML docs
 ls `cat $1/distrib/msw/wx_html.rsp` > /tmp/html.txt
-tar cvf $2/wxWindows-${WXVER}-htm.tar -T /tmp/html.txt
-gzip $2/wxWindows-${WXVER}-htm.tar
-mv $2/wxWindows-${WXVER}-htm.tar.gz $2/wxWindows-${WXVER}-htm.tgz
+tar cvf $2/wxWindows-${WXVER}-HTML.tar -T /tmp/html.txt
+gzip $2/wxWindows-${WXVER}-HTML.tar
+mv $2/wxWindows-${WXVER}-HTML.tar.gz $2/wxWindows-${WXVER}-HTML.tgz
 
 ### HTB (wxHTML Help) docs
 ls `cat $1/distrib/msw/wx_htb.rsp` > /tmp/htb.txt
-tar cvf $2/wxWindows-${WXVER}-htb.tar -T /tmp/htb.txt
-gzip $2/wxWindows-${WXVER}-htb.tar
-mv $2/wxWindows-${WXVER}-htb.tar.gz $2/wxWindows-${WXVER}-htb.tgz
+tar cvf $2/wxWindows-${WXVER}-HTB.tar -T /tmp/htb.txt
+gzip $2/wxWindows-${WXVER}-HTB.tar
+mv $2/wxWindows-${WXVER}-HTB.tar.gz $2/wxWindows-${WXVER}-HTB.tgz
 
 ### PDF docs
 ls `cat $1/distrib/msw/wx_pdf.rsp` > /tmp/pdf.txt
-tar cvf $2/wxWindows-${WXVER}-pdf.tar -T /tmp/pdf.txt
-gzip $2/wxWindows-${WXVER}-pdf.tar
-mv $2/wxWindows-${WXVER}-pdf.tar.gz $2/wxWindows-${WXVER}-pdf.tgz
+tar cvf $2/wxWindows-${WXVER}-PDF.tar -T /tmp/pdf.txt
+gzip $2/wxWindows-${WXVER}-PDF.tar
+mv $2/wxWindows-${WXVER}-PDF.tar.gz $2/wxWindows-${WXVER}-PDF.tgz
 
 ### Stubs files
 #ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt
diff --git a/distrib/msw/wisetop.txt b/distrib/msw/wisetop.txt
index ce4d3e001d..81da20b1da 100644
--- a/distrib/msw/wisetop.txt
+++ b/distrib/msw/wisetop.txt
@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
   Version=5.0
-  Title=wxWindows 2.1.15 Installation
+  Title=wxWindows 2.1.16 Installation
   Flags=00000100
   Split=1420
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -47,7 +47,7 @@ item: End Block
 end
 item: Set Variable
   Variable=APPTITLE
-  Value=wxWindows 2.1.15
+  Value=wxWindows 2.1.16
 end
 item: Set Variable
   Variable=GROUP
diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index 1a33eb9594..6d93178a46 100755
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -171,7 +171,7 @@ copy %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt bin
 copy %src\docs\winhelp\tex2rtf.hlp %src\docs\winhelp\tex2rtf.cnt bin
 
 Rem Make wxMSW-xxx.zip
-zip32 ..\wxMSW-%version%.zip *
+zip32 -r ..\wxMSW-%version%.zip *
 
 rem Time to regenerate the WISE install script, wxwin2.wse.
 rem NB: if you've changed wxwin2.wse using WISE, call splitwise.exe
@@ -213,7 +213,7 @@ ren setup.w07 s
 ren s setup.w07
 
 rem Put all the setup files into a single zip archive.
-zip32 wxWindows-%version%-setup.zip readme.txt setup.*
+zip32 wxMSW-%version%-setup.zip readme.txt setup.*
 
 echo wxWindows archived.
 
diff --git a/docs/gtk/makewxgtk b/docs/gtk/makewxgtk
index d6d76f2124..2e5bcdb220 100644
--- a/docs/gtk/makewxgtk
+++ b/docs/gtk/makewxgtk
@@ -6,6 +6,6 @@
 # if you're feeling braven, you may wish to compile with threads.
 # -- Julian Smart
 rm -f *.cache
-chmod a+x configure config.sub config.guess samples/configure contrib/configure
+chmod a+x configure config.sub config.guess samples/configure demos/configure contrib/configure
 ./configure --disable-shared --with-gtk --with-debug_flag --with-debug_info --enable-debug --without-threads --without-sockets -without-odbc -without-libjpeg
 make
diff --git a/docs/motif/issues.txt b/docs/motif/issues.txt
index c6d224ba27..98a32d4f3e 100644
--- a/docs/motif/issues.txt
+++ b/docs/motif/issues.txt
@@ -26,6 +26,11 @@ See also: todo.txt.
 - wxFrame can accept events, but apps cannot draw into it for
   Workaround: use an embedded wxWindow.
 
+- The background of a window sometimes isn't restored when changing
+  notebook pages (see sashtest, mdi examples). The notebook background
+  colour shows through. A resize, or scroll, restores the correct
+  background colour.
+
 - In Life! sample, text above slider isn't legible.
 
 - samples/html/helpview and samples/help demonstrate that sometimes,
diff --git a/docs/motif/makewxmotif b/docs/motif/makewxmotif
index 3146edfe56..bed60a303b 100644
--- a/docs/motif/makewxmotif
+++ b/docs/motif/makewxmotif
@@ -6,6 +6,6 @@
 # if you're feeling brave, you may wish to compile with threads.
 # -- Julian Smart
 rm -f *.cache
-chmod a+x configure config.sub config.guess samples/configure contrib/configure
+chmod a+x configure config.sub config.guess samples/configure demos/configure contrib/configure
 ./configure --disable-shared --with-motif --without-gtk --with-debug_flag --with-debug_info --enable-debug --without-sockets --without-odbc --without-threads --enable-newgrid
 make
diff --git a/samples/sashtest/sashtest.cpp b/samples/sashtest/sashtest.cpp
index 00104632c0..9ae3762560 100644
--- a/samples/sashtest/sashtest.cpp
+++ b/samples/sashtest/sashtest.cpp
@@ -266,6 +266,7 @@ END_EVENT_TABLE()
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):
  wxScrolledWindow(parent, -1, pos, size, wxSUNKEN_BORDER)
 {
+    SetBackgroundColour(* wxWHITE);
 }
 
 // Define the repainting behaviour
diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp
index 926f404c0e..97019ea950 100644
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -592,12 +592,12 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
     wxRect clientRect = GetAvailableClientSize();
     pPage->SetSize(clientRect.x, clientRect.y, clientRect.width, clientRect.height);
 
+    Refresh();
+
     pPage->Show(TRUE);
     pPage->Raise();
     pPage->SetFocus();
 
-    Refresh();
-
     m_nSelection = nSel;
 }
 
diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 2a8e53ebab..dd24fa4ac9 100644
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -747,11 +747,16 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
         return FALSE;
     }
 
-    wxASSERT_MSG( m_cursor.Ok(),
-                  wxT("cursor must be valid after call to the base version"));
+    //    wxASSERT_MSG( m_cursor.Ok(),
+    //                  wxT("cursor must be valid after call to the base version"));
+    wxCursor* cursor2 = NULL;
+    if (m_cursor.Ok())
+        cursor2 = & m_cursor;
+    else
+        cursor2 = wxSTANDARD_CURSOR;
 
     WXDisplay *dpy = GetXDisplay();
-    WXCursor x_cursor = m_cursor.GetXCursor(dpy);
+    WXCursor x_cursor = cursor2->GetXCursor(dpy);
 
     Widget w = (Widget) GetMainWidget();
     Window win = XtWindow(w);