diff --git a/Makefile.in b/Makefile.in
index a3a2ea8d24..2d273b0165 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6851,6 +6851,7 @@ clean:
 	rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 	rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
 	rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a
+	(cd samples && $(MAKE) clean)
 	rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__coredll_PCH_DEP)  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
@@ -11182,6 +11183,17 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in
 	fi; \
 	$(INSTALL_DATA) $(srcdir)/include//$$f $(includedir)/$$f; \
 	done
+	@echo " "
+	@echo " The installation of wxWindows is finished.  On certain"
+	@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
+	@echo " if you installed a shared library and also modify the"
+	@echo " LD_LIBRARY_PATH (or equivalent) environment variable."
+	@echo " "
+	@echo " wxWindows comes with no guarantees and doesn't claim"
+	@echo " to be suitable for any purpose."
+	@echo " "
+	@echo " Read the wxWindows Licence on licencing conditions."
+	@echo " "
 
 @COND_USE_GUI_1@install-afm: 
 @COND_USE_GUI_1@	$(INSTALL_DIR) $(datadir)/wx/2.5/afm
@@ -16501,6 +16513,9 @@ odbclib_db.o: $(srcdir)/src/common/db.cpp
 odbclib_dbtable.o: $(srcdir)/src/common/dbtable.cpp
 	$(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $<
 
+samples: 
+	(cd samples && $(MAKE) all)
+
 uninstall: 
 
 @COND_WXUSE_EXPAT_BUILTIN@$(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXEXPAT_OBJECTS)
@@ -16959,4 +16974,4 @@ xmllib_xml.o: $(srcdir)/src/xml/xml.cpp
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all clean distclean install install_advdll install_advlib install_basedll install_baselib install_coredll install_corelib install_dbgriddll install_dbgridlib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_netdll install_netlib install_odbcdll install_odbclib install_wxexpat install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib install_xmldll install_xmllib uninstall
+.PHONY: all clean distclean install install_advdll install_advlib install_basedll install_baselib install_coredll install_corelib install_dbgriddll install_dbgridlib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_netdll install_netlib install_odbcdll install_odbclib install_wxexpat install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib install_xmldll install_xmllib samples uninstall
diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 14edf7dfbc..7de10f2a76 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -28,11 +28,11 @@
     
     
     <!-- Samples target (not dependency of 'all'): -->
-    <!-- [ FIXME disabled; currently causes make install to go into samples ]
     <subproject id="samples">
-        <dir>samples</dir>
+        <installable>no</installable>
+        <dir cond="FORMAT=='autoconf'">samples</dir>
+        <dir cond="FORMAT!='autoconf' and TOOLKIT=='MSW'">../../samples</dir>
     </subproject>
-    -->
 
     <if cond="FORMAT=='autoconf'">       
         <!-- "make install": -->
@@ -119,4 +119,24 @@
         </copy-file-to-file-if-not-exist>
     </if>
 
+
+    <!-- Show this banner after installation: -->
+    <if cond="FORMAT=='autoconf'">
+        <modify-target target="install">
+            <command>
+@echo " "
+@echo " The installation of wxWindows is finished.  On certain"
+@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
+@echo " if you installed a shared library and also modify the"
+@echo " LD_LIBRARY_PATH (or equivalent) environment variable."
+@echo " "
+@echo " wxWindows comes with no guarantees and doesn't claim"
+@echo " to be suitable for any purpose."
+@echo " "
+@echo " Read the wxWindows Licence on licencing conditions."
+@echo " "
+            </command>
+        </modify-target>
+    </if>
+
 </makefile>
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 6629d5ef8e..076fbbcd39 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -366,6 +366,14 @@ HTMLLIB_OBJECTS =  \
 	$(OBJS)\htmllib_htmllbox.obj
 LIBDIRNAME = \
 	..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+MAKEARGS = -DCPPFLAGS=$(CPPFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) \
+	-DLDFLAGS=$(LDFLAGS) -DCC=$(CC) -DUSE_GUI=$(USE_GUI) \
+	-DMONOLITHIC=$(MONOLITHIC) -DCXXFLAGS=$(CXXFLAGS) -DUSE_HTML=$(USE_HTML) \
+	-DBUILD=$(BUILD) -DDEBUG_INFO=$(DEBUG_INFO) -DVENDOR=$(VENDOR) \
+	-DUNICODE=$(UNICODE) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DMSLU=$(MSLU) \
+	-DWXUNIV=$(WXUNIV) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DCXX=$(CXX) -DCFG=$(CFG) \
+	-DCFLAGS=$(CFLAGS) -DSHARED=$(SHARED) -DUSE_ODBC=$(USE_ODBC) \
+	-DUSE_OPENGL=$(USE_OPENGL)
 MONODLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
 	-tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
@@ -9007,6 +9015,11 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_d
 |
 !endif
 
+samples: 
+	cd ..\..\samples
+	$(MAKE) -f makefile.bcc $(MAKEARGS) all
+	cd ..\..\..
+
 $(LIBDIRNAME)\wx\setup.h: 
 	if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h
 
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 7e6af1431e..ba77d8c4ee 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -352,6 +352,13 @@ HTMLLIB_OBJECTS =  \
 	$(OBJS)\htmllib_htmllbox.o
 LIBDIRNAME = \
 	..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+MAKEARGS = CPPFLAGS=$(CPPFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) LDFLAGS=$(LDFLAGS) \
+	CC=$(CC) USE_GUI=$(USE_GUI) MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) \
+	GCC_VERSION=$(GCC_VERSION) USE_HTML=$(USE_HTML) BUILD=$(BUILD) \
+	DEBUG_INFO=$(DEBUG_INFO) VENDOR=$(VENDOR) UNICODE=$(UNICODE) \
+	OFFICIAL_BUILD=$(OFFICIAL_BUILD) MSLU=$(MSLU) WXUNIV=$(WXUNIV) \
+	RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) CFLAGS=$(CFLAGS) \
+	SHARED=$(SHARED) USE_ODBC=$(USE_ODBC) USE_OPENGL=$(USE_OPENGL)
 MONODLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
@@ -9507,6 +9514,9 @@ endif
 endif
 endif
 
+samples: 
+	$(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) all
+
 $(LIBDIRNAME)\wx\setup.h: 
 	if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h
 
@@ -9564,4 +9574,4 @@ $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a: $(XMLLIB_OBJECTS)
 endif
 endif
 
-.PHONY: all clean setup_h
+.PHONY: all clean samples setup_h
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index f35c680b79..a80ffb6e5f 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -9569,6 +9569,11 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_d
 <<
 !endif
 
+sub_samples: 
+	cd ..\..\samples
+	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	cd $(MAKEDIR)
+
 $(LIBDIRNAME)\wx\setup.h: 
 	if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h
 
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index a679189cf2..b582abbc37 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -2316,6 +2316,13 @@ HTMLLIB_OBJECTS =  &
 	$(OBJS)\htmllib_htmllbox.obj
 LIBDIRNAME = &
 	..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+MAKEARGS = CPPFLAGS=$(CPPFLAGS) OFFICIAL_BUILD=$(OFFICIAL_BUILD) &
+	WXUNIV=$(WXUNIV) DEBUG_FLAG=$(DEBUG_FLAG) CFLAGS=$(CFLAGS) &
+	RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) USE_GUI=$(USE_GUI) &
+	MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) CC=$(CC) USE_HTML=$(USE_HTML) &
+	BUILD=$(BUILD) LDFLAGS=$(LDFLAGS) DEBUG_INFO=$(DEBUG_INFO) SHARED=$(SHARED) &
+	VENDOR=$(VENDOR) USE_OPENGL=$(USE_OPENGL) USE_ODBC=$(USE_ODBC) &
+	UNICODE=$(UNICODE)
 MONODLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\..\include -i=$(LIBDIRNAME) -i=..\..\src\tiff &
@@ -9691,6 +9698,11 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib :  $(ODBCLIB_OBJEC
 !endif
 !endif
 
+samples : .SYMBOLIC 
+	cd ..\..\samples
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
 $(LIBDIRNAME)\wx\setup.h :  
 	if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h