diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index e970aa0771..05dcc07734 100644
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -644,6 +644,7 @@ samples/image/*.pnm
 samples/image/*.pcx
 samples/image/*.jpg
 samples/image/*.gif
+samples/image/*.tif
 samples/image/*.ico
 samples/image/*.txt
 
diff --git a/distrib/msw/patch.rsp b/distrib/msw/patch.rsp
index 30718cb8f3..58c7ffe9b4 100644
--- a/distrib/msw/patch.rsp
+++ b/distrib/msw/patch.rsp
@@ -3,19 +3,29 @@ include/wx/sckipc.h
 include/wx/ipcbase.h
 include/wx/gtk/pen.h
 include/wx/defs.h
+include/wx/version.h
+include/wx/generic/grid.h
 src/msw/treectrl.cpp
 src/common/sckipc.cpp
 src/common/intl.cpp
+src/gtk/frame.cpp
+src/gtk/mdi.cpp
+src/motif/dialog.cpp
 src/generic/scrolwin.cpp
+src/generic/listctrl.cpp
+src/generic/grid.cpp
 src/gtk/settings.cpp
 samples/treectrl/TreectrlVC.dsp
+samples/treectrl/treectrl.cpp
 samples/sockets/client.g95
 samples/sockets/server.g95
 samples/ipc/client.g95
 samples/ipc/server.g95
+samples/wizard/WizardVC.dsp
 
 src/xpm/makefile.b32
 configure
 configure.in
 docs/msw/install.txt
+src/makewat.env
 
diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 1f94886634..7190bb6f1a 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -94,7 +94,7 @@ scrolwin.cpp	G
 splitter.cpp	G
 statline.cpp	G	U,R,P
 statusbr.cpp	G
-tabg.cpp	G	16,P
+tabg.cpp	G	P
 numdlgg.cpp	G
 tbarsmpl.cpp	G
 textdlgg.cpp	G
diff --git a/distrib/msw/wisetop.txt b/distrib/msw/wisetop.txt
index d559db5e95..ce4d3e001d 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.14 Installation
+  Title=wxWindows 2.1.15 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.14
+  Value=wxWindows 2.1.15
 end
 item: Set Variable
   Variable=GROUP
diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index 8cb7038b8f..6c8d7d9f59 100755
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -5,7 +5,7 @@ set dest=%src\deliver
 set wise=0
 
 Rem Set this to the required version
-set version=2_1_14
+set version=2_1_15
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
diff --git a/distrib/msw/zippatch.bat b/distrib/msw/zippatch.bat
index 37742c7514..4980369d25 100755
--- a/distrib/msw/zippatch.bat
+++ b/distrib/msw/zippatch.bat
@@ -1,12 +1,10 @@
 @echo off
 rem Zip up a patch file
-Rem m:\wx2 contains the latest version + any crucial patches
-set src=m:\wx2
+set src=d:\wx2\wxWindows
 set dest=%wxwin\deliver
-set wise=0
 
 Rem Set this to the required patch version
-set version=03
+set version=01
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
diff --git a/docs/changes.txt b/docs/changes.txt
index 750092303f..4c12a6e990 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,7 +1,7 @@
 wxWindows 2 Change Log
 ----------------------
 
-2.1.14
+2.1.15
 ------
 
 Documentation:
diff --git a/docs/html/news.htm b/docs/html/news.htm
index 6b9af3c139..48dfaad7ea 100644
--- a/docs/html/news.htm
+++ b/docs/html/news.htm
@@ -18,6 +18,15 @@ News
 </tr>
 </table>
 
+<H3><a name="release2_1_15">March 28th, 2000</H3><P>
+
+<ul>
+<li><a href="download.htm" target=wxmain>wxWindows 2.1.15</a> contains a few fixes
+for wxGTK and wxMSW. wxMSW and wxMotif users who already have 2.1.14 do not need to rush to
+download this version! The fixes in the patch file (see main download page) contain the
+major differences between 2.1.14 and 2.1.15.
+</ul>
+
 <H3><a name="release2_1_14">March 21st, 2000</H3><P>
 
 <ul>
@@ -26,9 +35,9 @@ Again, great strides have been made since the previous official version (2.1.11)
 stable version. Many things have been fixed and added but <a href="newver.htm">here are some highlights</a>.
 <li>Robin Dunn is contributing a wxStyledTextCtrl, a wrapper around the <a href="http://www.scintilla.org/" target=_new>Scintilla</a>
 styled text edit control. It can be used to provide syntax highlighting for various languages, and other applications.
-A snapshot of this work in progress, stc.zip, is provided on the ftp site alongside wxWindows 2.1.14.
+A snapshot of this work in progress, stc.zip, is provided on the ftp site alongside the latest wxWindows release.
 <li>Guilhem Lavaux has reworked his MMedia sound and video class library and started its documentation;
-it too is available alongside 2.1.14 as mmedia.zip.
+it too is available alongside the latest release as mmedia.zip.
 </ul>
 
 <H3>January 14th, 2000</H3><P>
diff --git a/docs/motif/issues.txt b/docs/motif/issues.txt
index 5bb2656c0e..4744a80d08 100644
--- a/docs/motif/issues.txt
+++ b/docs/motif/issues.txt
@@ -26,9 +26,12 @@ See also: todo.txt.
 
 - In Life! sample, text above slider isn't legible.
 
-- samples/html/helpview and samples/help show a problem when showing
-  the advanced HTML help controller: a BadDrawable X error occurs
- (unfortunately hard to tell where). Somewhere in wxHtmlHelpFrame.
+- samples/html/helpview and samples/help demonstrate that sometimes,
+  XPM images can't be loaded, perhaps only in 256-colour mode. This
+  will now cause an assert rather than an X error. But we need to
+  either cure the XPM loading problem, or provide alternative toolbar
+  buttons (for HelpView) and icons (for places where icons are used e.g.
+  in the log dialog).
 
 - Dialog Editor needs a lot of work.
 
diff --git a/docs/readme.txt b/docs/readme.txt
index 8d649fd4ca..9740814b98 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-wxWindows 2.1.14
+wxWindows 2.1.15
 ----------------
 
 Welcome to wxWindows 2, a sophisticated cross-platform C++
diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index aa77bcbfaf..9732e74fa5 100644
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -30,7 +30,8 @@ class WXDLLEXPORT wxDateSpan;
 // performances and this only leads to increased rebuild time (because every
 // time an inline method is changed, all files including the header must be
 // rebuilt)
-#ifdef __WXDEBUG__
+// For Mingw32, causes a link error.
+#if defined( __WXDEBUG__) && !defined(__MINGW32__)
     #define inline
 #endif // Debug
 
diff --git a/include/wx/html/msw/wfolder.ico b/include/wx/html/msw/wfolder.ico
index c42bea7082..0ffdb660e3 100644
Binary files a/include/wx/html/msw/wfolder.ico and b/include/wx/html/msw/wfolder.ico differ
diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 1bd0469258..1226d4b5aa 100644
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -31,8 +31,8 @@
 // Use this line for wxWindows v1.x
 //#include "wx_ver.h"
 // Use this line for wxWindows v2.x
-#include "wx/version.h"
 #include  "wx/wxprec.h"
+#include "wx/version.h"
 
 #if wxMAJOR_VERSION == 2
 #   ifdef __GNUG__
diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index 3078d70528..5e3f56ce34 100644
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -29,6 +29,9 @@
 #include "wx/app.h"
 extern "C"
 {
+#ifdef __WATCOMC__
+    #define HAVE_BOOLEAN
+#endif
     #include "jpeglib.h"
 }
 #include "wx/filefn.h"
diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 531c8df511..26e623c1b5 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -1509,7 +1509,7 @@ bool wxVariant::operator== (void* value) const
 
 bool wxVariant::operator!= (void* value) const
 {
-    return (!((*this) == value));
+    return (!((*this) == (void*) value));
 }
 
 void wxVariant::operator= (void* value)
diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index e3c94a1717..42d94427c6 100644
--- a/src/jpeg/jconfig.h
+++ b/src/jpeg/jconfig.h
@@ -56,6 +56,8 @@
 /* #define INLINE __inline__ */
 #if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400)
 #define INLINE
+#elif defined(__WATCOMC__)
+#define INLINE
 #else
 #define INLINE inline
 #endif
diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 9fb63cd3cc..cef0f61fb8 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -157,7 +157,7 @@ LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
 // FIXME wxUSE_ON_FATAL_EXCEPTION is only supported for VC++ now because it
 //       needs compiler support for Win32 SEH. Others (especially Borland)
 //       probably have it too, but I'm not sure about how it works
-#ifndef __VISUALC__
+#if !defined(__VISUALC__) || defined(__WIN16__)
     #undef wxUSE_ON_FATAL_EXCEPTION
     #define wxUSE_ON_FATAL_EXCEPTION 0
 #endif // VC++
diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 99759d70ad..d6c31365cc 100644
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -91,7 +91,11 @@ bool wxButton::Create(wxWindow *parent,
     if (m_hWnd == 0)
     {
         wxString msg;
+#ifdef __WIN16__
+        msg.Printf(wxT("CreateWindowEx failed"));
+#else
         msg.Printf(wxT("CreateWindowEx failed with error number %ld"), (long) GetLastError());
+#endif
         wxFAIL_MSG(msg);
     }
 
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index a1ba23a7a8..420f296b7b 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 20:13, 2000/03/31
+# This file was automatically generated by tmake at 12:33, 2000/04/05
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -102,6 +102,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
 		..\generic\$D\scrolwin.obj \
 		..\generic\$D\splitter.obj \
 		..\generic\$D\statusbr.obj \
+		..\generic\$D\tabg.obj \
 		..\generic\$D\tbarsmpl.obj \
 		..\generic\$D\textdlgg.obj \
 		..\generic\$D\tipdlg.obj \
@@ -127,7 +128,6 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
 		..\generic\$D\printps.obj \
 		..\generic\$D\prntdlgg.obj \
 		..\generic\$D\statline.obj \
-		..\generic\$D\tabg.obj \
 		..\generic\$D\treectrl.obj
 
 COMMONOBJS = \
diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 388c857c17..08a6b2df3f 100644
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -187,4 +187,4 @@ int wxPageSetupDialog::ShowModal()
 }
 
 #endif
-    // wxUSE_PRINTING_ARCHITECTURE
\ No newline at end of file
+    // wxUSE_PRINTING_ARCHITECTURE
diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index add461b25a..a034cb184c 100644
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXMAKINGDLL=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXMAKINGDLL=1 /Yu"wx/wxprec.h" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -1416,7 +1416,7 @@ SOURCE=.\jpeg\jcapimin.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1433,7 +1433,7 @@ SOURCE=.\jpeg\jcapistd.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1450,7 +1450,7 @@ SOURCE=.\jpeg\jccoefct.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1467,7 +1467,7 @@ SOURCE=.\jpeg\jccolor.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1484,7 +1484,7 @@ SOURCE=.\jpeg\jcdctmgr.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1501,7 +1501,7 @@ SOURCE=.\jpeg\jchuff.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1518,7 +1518,7 @@ SOURCE=.\jpeg\jcinit.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1535,7 +1535,7 @@ SOURCE=.\jpeg\jcmainct.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1552,7 +1552,7 @@ SOURCE=.\jpeg\jcmarker.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1569,7 +1569,7 @@ SOURCE=.\jpeg\jcmaster.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1586,7 +1586,7 @@ SOURCE=.\jpeg\jcomapi.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1603,7 +1603,7 @@ SOURCE=.\jpeg\jcparam.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1620,7 +1620,7 @@ SOURCE=.\jpeg\jcphuff.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1637,7 +1637,7 @@ SOURCE=.\jpeg\jcprepct.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1654,7 +1654,7 @@ SOURCE=.\jpeg\jcsample.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1671,7 +1671,7 @@ SOURCE=.\jpeg\jctrans.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1688,7 +1688,7 @@ SOURCE=.\jpeg\jdapimin.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1705,7 +1705,7 @@ SOURCE=.\jpeg\jdapistd.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1722,7 +1722,7 @@ SOURCE=.\jpeg\jdatadst.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1739,7 +1739,7 @@ SOURCE=.\jpeg\jdatasrc.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1756,7 +1756,7 @@ SOURCE=.\jpeg\jdcoefct.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1773,7 +1773,7 @@ SOURCE=.\jpeg\jdcolor.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1790,7 +1790,7 @@ SOURCE=.\jpeg\jddctmgr.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1807,7 +1807,7 @@ SOURCE=.\jpeg\jdhuff.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1824,7 +1824,7 @@ SOURCE=.\jpeg\jdinput.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1841,7 +1841,7 @@ SOURCE=.\jpeg\jdmainct.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1858,7 +1858,7 @@ SOURCE=.\jpeg\jdmarker.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1875,7 +1875,7 @@ SOURCE=.\jpeg\jdmaster.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1892,7 +1892,7 @@ SOURCE=.\jpeg\jdmerge.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1909,7 +1909,7 @@ SOURCE=.\jpeg\jdphuff.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1926,7 +1926,7 @@ SOURCE=.\jpeg\jdpostct.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1943,7 +1943,7 @@ SOURCE=.\jpeg\jdsample.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1960,7 +1960,7 @@ SOURCE=.\jpeg\jdtrans.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1977,7 +1977,7 @@ SOURCE=.\jpeg\jerror.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -1994,7 +1994,7 @@ SOURCE=.\jpeg\jfdctflt.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -2011,7 +2011,7 @@ SOURCE=.\jpeg\jfdctfst.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -2028,7 +2028,7 @@ SOURCE=.\jpeg\jfdctint.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -2045,7 +2045,7 @@ SOURCE=.\jpeg\jidctflt.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -2062,7 +2062,7 @@ SOURCE=.\jpeg\jidctfst.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -2079,7 +2079,7 @@ SOURCE=.\jpeg\jidctint.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -2096,7 +2096,7 @@ SOURCE=.\jpeg\jidctred.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -2113,7 +2113,7 @@ SOURCE=.\jpeg\jmemmgr.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -2130,7 +2130,7 @@ SOURCE=.\jpeg\jmemnobs.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -2147,7 +2147,7 @@ SOURCE=.\jpeg\jquant1.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -2164,7 +2164,7 @@ SOURCE=.\jpeg\jquant2.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
@@ -2181,7 +2181,7 @@ SOURCE=.\jpeg\jutils.c
 
 !ELSEIF  "$(CFG)" == "wxvc_dll - Win32 Debug"
 
-# ADD CPP /I ".."
+# ADD CPP /Zi /I ".."
 # SUBTRACT CPP /YX /Yc /Yu
 
 !ENDIF 
diff --git a/wxMotif.spec b/wxMotif.spec
index 9e9e874dcd..3a96d97dbf 100644
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -1,6 +1,6 @@
 # Note that this is NOT a relocatable package
 %define pref /usr
-%define ver 2.1.14
+%define ver 2.1.15
 %define rel 0
 
 Summary: The Motif port of the wxWindows library
@@ -9,8 +9,8 @@ Version: %{ver}
 Release: %{rel}
 Copyright: wxWindows Licence
 Group: X11/Libraries
-Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxMotif-2.1.0-b8.tgz
-URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html
+Source: wxMotif-%{ver}.tgz
+URL: http://www.wxwindows.org
 Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
 BuildRoot: /tmp/wxmotif_root