diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d48b327601..b22a69fad9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,20 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-24 09:42 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbwin/hbwin.ch
+    + Added new macros submitted by Xavi.
+      Formatting (tab removal/alignment) applied.
+
+  * config/detfun.mk
+    + Displays "Configure with HB_WITH_*" text on non-*nix systems,
+      when an external component is not found.
+      Comments are welcome whether this is useful, it looks a bit
+      verbose/ugly to me.
+
+  * INSTALL
+    * Minor change in wording.
+
 2009-11-23 18:09 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbide/hbide.prg
     ! Few more additions.
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 105a333505..9e9b48467e 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -1265,7 +1265,7 @@ HARBOUR
          http://www.libpng.org/pub/png/libpng.html
       HB_WITH_QT - Nokia QT (GUI) [win, wce, darwin, linux, free, open-source]
          http://qt.nokia.com/products
-         How to build static and MSVC versions:
+         How to create static and MSVC builds:
             http://doc.trolltech.com/4.5/deployment-windows.html
       HB_WITH_SQLITE3 - sqlite3 [multiplatform, free, open-source]
          http://www.sqlite.org/
diff --git a/harbour/config/detfun.mk b/harbour/config/detfun.mk
index 021b754fd2..e2bb00281a 100644
--- a/harbour/config/detfun.mk
+++ b/harbour/config/detfun.mk
@@ -13,7 +13,7 @@
 # USAGE:
 #    ON CALL:
 #       _DET_DSP_NAME - human readable name of external component.
-#       _DET_VAR_INC_ - variable name containing user component control (typically "HB_INC_*").
+#       _DET_VAR_INC_ - variable name containing user component control (typically "HB_WITH_*").
 #       _DET_VAR_HAS_ - variable name receiving detection result (typically "HB_HAS_*").
 #       _DET_FLT_PLAT - positive and negative platform filters. Prefix negative ones with '!' char.
 #       _DET_FLT_COMP - positive and negative compiler filters. Prefix negative ones with '!' char.
@@ -22,7 +22,7 @@
 #       _DET_INC_LOCL - embedded location to look at.
 #                       (you must use absolute paths only.)
 #       _DET_INC_HEAD - header filename to look for. Unless looking for a directory, prefix with forward slash.
-#       - variable name specified by _DET_VAR_INC_ (typically "HB_INC_*") containing:
+#       - variable name specified by _DET_VAR_INC_ (typically "HB_WITH_*") containing:
 #          (empty) or yes - will enable external component if found on default locations.
 #          no             - will disable external component.
 #          force          - will forcibly enable external component, bypassing location checks,
@@ -95,6 +95,9 @@ ifeq ($($(_DET_VAR_HAS_)),)
                         $(_DET_VAR_HAS_) := $(strip $(firstword $(foreach d,$($(_DET_VAR_HAS_)),$(if $(wildcard $(d)$(_DET_INC_HEAD)),$(d),))))
                         ifeq ($($(_DET_VAR_HAS_)),)
                            _DET_RES_TEXT := '$(_DET_DSP_NAME)' not found
+                           ifneq ($(HB_HOST_PLAT_UNIX),yes)
+                              _DET_RES_TEXT := $(_DET_RES_TEXT). Configure with $(subst HB_INC_,HB_WITH_,$(_DET_VAR_INC_)).
+                           endif
                            $(call do_info,$(_DET_RES_TEXT))
                         else
                            # detect if the component was found in locally hosted dir
diff --git a/harbour/contrib/hbwin/hbwin.ch b/harbour/contrib/hbwin/hbwin.ch
index 534f03c23f..c1f93c5462 100644
--- a/harbour/contrib/hbwin/hbwin.ch
+++ b/harbour/contrib/hbwin/hbwin.ch
@@ -139,6 +139,43 @@
 #define MM_LOENGLISH           4
 #define MM_HIENGLISH           5
 
+#define FW_DONTCARE            0
+#define FW_THIN                100
+#define FW_EXTRALIGHT          200
+#define FW_ULTRALIGHT          FW_EXTRALIGHT
+#define FW_LIGHT               300
+#define FW_NORMAL              400
+#define FW_REGULAR             FW_NORMAL
+#define FW_MEDIUM              500
+#define FW_SEMIBOLD            600
+#define FW_DEMIBOLD            FW_SEMIBOLD
+#define FW_BOLD                700
+#define FW_EXTRABOLD           800
+#define FW_ULTRABOLD           FW_EXTRABOLD
+#define FW_HEAVY               900
+#define FW_BLACK               FW_HEAVY
+
+#define ANSI_CHARSET           0
+#define DEFAULT_CHARSET        1
+#define SYMBOL_CHARSET         2
+#define MAC_CHARSET            77
+#define SHIFTJIS_CHARSET       128
+#define HANGEUL_CHARSET        129
+#define HANGUL_CHARSET         129
+#define JOHAB_CHARSET          130
+#define GB2312_CHARSET         134
+#define CHINESEBIG5_CHARSET    136
+#define GREEK_CHARSET          161
+#define TURKISH_CHARSET        162
+#define VIETNAMESE_CHARSET     163
+#define HEBREW_CHARSET         177
+#define ARABIC_CHARSET         178
+#define BALTIC_CHARSET         186
+#define RUSSIAN_CHARSET        204
+#define THAI_CHARSET           222
+#define EASTEUROPE_CHARSET     238
+#define OEM_CHARSET            255
+
 /* Device Parameters for win_GetDeviceCaps() */
 
 #define HORZSIZE               4   // Horizontal size in millimeters