diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d3dd2cb471..a9ca5e882e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-25 12:35 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/hbwin/win_misc.c
+    ! fixed buffer overflow in WIN_WIDETOANSI() caused by wrongly calculated
+      buffer size
+
+  * harbour/utils/hbmk2/hbmk2.prg
+    * updated names of xHarbour libraries - now it works in static mode
+      TOFIX: -xhb shared mode uses 'harbour' instead of 'xharbour' library
+              and 'hbmainstd' instead of 'mainstd'
+      TOFIX2: -gui switch in -xhb mode cause compile time error:
+                  /tmp/hbmk_auhl2d.c:8: error: syntax error before "void"
+
 2010-01-24 22:28 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbxbp/Makefile
   * contrib/hbxbp/hbpprocess.prg
diff --git a/harbour/contrib/hbwin/win_misc.c b/harbour/contrib/hbwin/win_misc.c
index dd28b9dddc..55e3f6e68d 100644
--- a/harbour/contrib/hbwin/win_misc.c
+++ b/harbour/contrib/hbwin/win_misc.c
@@ -199,7 +199,7 @@ HB_FUNC( WIN_WIDETOANSI )
 {
    HB_SIZE nLen = hb_parclen( 1 );
    LPCWSTR lpSrcWide = ( LPCWSTR ) hb_parcx( 1 );
-   DWORD dwLength = WideCharToMultiByte( CP_ACP, 0, lpSrcWide, ( int ) nLen, NULL, 0, NULL, NULL ) / sizeof( wchar_t );
+   DWORD dwLength = WideCharToMultiByte( CP_ACP, 0, lpSrcWide, ( int ) nLen, NULL, 0, NULL, NULL );
    LPSTR lpDstMB = ( LPSTR ) hb_xgrab( dwLength + 1 );
 
    WideCharToMultiByte( CP_ACP, 0, lpSrcWide, ( int ) nLen, lpDstMB, dwLength + 1, NULL, NULL );
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 860a153af7..bf854aacc1 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -955,11 +955,11 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
       aLIB_BASE_2_MT    := { "rtlmt", "vmmt" }
       aLIB_BASE_GT      := { "gtcgi", "gtpca", "gtstd" }
       aLIB_BASE_NULRDD  := { "nulsys" }
-      aLIB_BASE_RDD     := { "rdd"  , "usrrdd"  , "rdds"  , "dbfntx"  , "dbfcdx"  , "dbffpt"  , "rdd"  , "hsx"  , "hbsix"   }
-      aLIB_BASE_RDD_MT  := { "rddmt", "usrrddmt", "rddsmt", "dbfntxmt", "dbfcdxmt", "dbffptmt", "rddmt", "hsxmt", "hbsixmt" }
+      aLIB_BASE_RDD     := { "rdd"  , "usrrdd", "dbfntx", "dbfcdx", "dbfnsx", "dbffpt", "rdd"  , "hsx", "hbsix" }
+      aLIB_BASE_RDD_MT  := { "rddmt", "usrrdd", "dbfntx", "dbfcdx", "dbfnsx", "dbffpt", "rddmt", "hsx", "hbsix" }
       aLIB_BASE_CPLR    := {}
-      aLIB_BASE_3       := { "macro"  , "pp"  , "common" }
-      aLIB_BASE_3_MT    := { "macromt", "ppmt", "common" }
+      aLIB_BASE_3       := { "macro"  , "pp", "common" }
+      aLIB_BASE_3_MT    := { "macromt", "pp", "common" }
       cLIB_BASE_PCRE    := "pcrepos"
       cLIB_BASE_ZLIB    := "zlib"
    ENDIF