diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f0e5d9891a..b423801664 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,22 +8,103 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-10-18 16:15 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  - bin/bld.bat
+  + bin/hbmk.bat
+  - bin/bld_os2.cmd
+  + bin/hbmk_os2.cmd
+  - bin/bld_b32.bat
+  + bin/hbmk_b32.bat
+  - bin/bld_vc.bat
+  + bin/hbmk_vc.bat
+  * tests/bld_b32.bat
+  * tests/bld_vc.bat
+  * contrib/hbmysql/tests/bld_b32.bat
+  * contrib/hbmysql/tests/bld_vc.bat
+  * contrib/hbct/tests/bld_b32.bat
+  * contrib/hbct/tests/bld_vc.bat
+  * contrib/xhb/tests/bld_b32.bat
+  * contrib/xhb/tests/bld_vc.bat
+  * contrib/hbodbc/tests/bld_b32.bat
+  * contrib/hbodbc/tests/bld_vc.bat
+  * contrib/hbtpathy/tests/bld_b32.bat
+  * contrib/hbtpathy/tests/bld_vc.bat
+  * contrib/hbmzip/tests/bld_b32.bat
+  * contrib/hbmzip/tests/bld_vc.bat
+  * contrib/hbole/tests/bld_b32.bat
+  * contrib/hbole/tests/bld_vc.bat
+  * contrib/hbsqlit3/tests/bld_b32.bat
+  * contrib/hbsqlit3/tests/bld_vc.bat
+  * contrib/hbapollo/tests/bld_b32.bat
+  * contrib/hbapollo/tests/bld_vc.bat
+  * contrib/hbfbird/tests/bld_b32.bat
+  * contrib/hbfbird/tests/bld_vc.bat
+  * contrib/hbziparc/tests/bld_b32.bat
+  * contrib/hbziparc/tests/bld_vc.bat
+  * contrib/hbnf/tests/bld_b32.bat
+  * contrib/hbnf/tests/bld_vc.bat
+  * contrib/hbcurl/tests/bld_b32.bat
+  * contrib/hbcurl/tests/bld_vc.bat
+  * contrib/hbhpdf/tests/bld_b32.bat
+  * contrib/hbhpdf/tests/bld_vc.bat
+  * contrib/rddado/tests/bld_b32.bat
+  * contrib/rddado/tests/bld_vc.bat
+  * contrib/gtwvg/tests/bld_vc.bat
+  * contrib/gtwvg/tests/bld_b32.bat
+  * contrib/hbpgsql/tests/bld_b32.bat
+  * contrib/hbpgsql/tests/bld_vc.bat
+  * contrib/hbclipsm/tests/bld_b32.bat
+  * contrib/hbclipsm/tests/bld_vc.bat
+  * contrib/rddads/tests/bld_b32.bat
+  * contrib/rddads/tests/bld_vc.bat
+  * contrib/hbfimage/tests/bld_b32.bat
+  * contrib/hbfimage/tests/bld_vc.bat
+  * contrib/hbgd/tests/bld_vc.bat
+  * contrib/hbgd/tests/bld_b32.bat
+  * contrib/hbmisc/tests/bld_b32.bat
+  * contrib/hbmisc/tests/bld_vc.bat
+  * contrib/hbgf/tests/bld_b32.bat
+  * contrib/hbgf/tests/bld_vc.bat
+  * contrib/hbtip/tests/bld_vc.bat
+  * contrib/hbtip/tests/bld_b32.bat
+  * contrib/hbwin/tests/bld_b32.bat
+  * contrib/hbwin/tests/bld_vc.bat
+  * contrib/hbvpdf/tests/bld_b32.bat
+  * contrib/hbvpdf/tests/bld_vc.bat
+  * contrib/hbwhat/tests/bld_b32.bat
+  * contrib/hbwhat/tests/bld_vc.bat
+  * contrib/examples/hbsqlit2/tests/bld_b32.bat
+  * contrib/examples/hbsqlit2/tests/bld_vc.bat
+    * Renamed bin\bld*.* files to bin\hbmk*.*. This 
+      dir may be put in the path in user environments, 
+      so it's necessary to put the name into the Harbour 
+      namespace. The new name is also the one supported 
+      on *nix/bash platforms, albeit with slightly 
+      different usage.
+      INCOMPATIBLE. Please update your environment.
+      To achieve compatbility with older Harbour versions 
+      and xhb, you can locally add a bld.bat file with 
+      the content: '@call hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9'
+
+  * source/common/hbgete.c
+    * Minor.
+
 2008-10-18 11:39 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/common/hbgete.c
     * modified hb_getenv_buffer() to return logical value indicating
       that environment variable exists even if no buffer is passed
 
 2008-10-18 10:56 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
-   * common.mak
-   * make_b32.mak
-   * make_vc.mak
-   * make_gcc.mak
-     % Harbour command line configuration moved to common.mak.
+  * common.mak
+  * make_b32.mak
+  * make_vc.mak
+  * make_gcc.mak
+    % Harbour command line configuration moved to common.mak.
 
-   * source/rtl/tclass.prg
-   * source/rtl/tget.prg
-     + NOTE added to tclass.prg.
-     * Minor formatting.
+  * source/rtl/tclass.prg
+  * source/rtl/tget.prg
+    + NOTE added to tclass.prg.
+    * Minor formatting.
 
 2008-10-18 10:27 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * include/hbapi.h
diff --git a/harbour/bin/bld.bat b/harbour/bin/hbmk.bat
similarity index 100%
rename from harbour/bin/bld.bat
rename to harbour/bin/hbmk.bat
diff --git a/harbour/bin/bld_b32.bat b/harbour/bin/hbmk_b32.bat
similarity index 88%
rename from harbour/bin/bld_b32.bat
rename to harbour/bin/hbmk_b32.bat
index 78449b0bb9..d71c220981 100644
--- a/harbour/bin/bld_b32.bat
+++ b/harbour/bin/hbmk_b32.bat
@@ -14,4 +14,4 @@ rem ---------------------------------------------------------------
 set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 
-call bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/bin/bld_os2.cmd b/harbour/bin/hbmk_os2.cmd
similarity index 100%
rename from harbour/bin/bld_os2.cmd
rename to harbour/bin/hbmk_os2.cmd
diff --git a/harbour/bin/bld_vc.bat b/harbour/bin/hbmk_vc.bat
similarity index 88%
rename from harbour/bin/bld_vc.bat
rename to harbour/bin/hbmk_vc.bat
index ea288a2a97..8197e1eb1b 100644
--- a/harbour/bin/bld_vc.bat
+++ b/harbour/bin/hbmk_vc.bat
@@ -14,4 +14,4 @@ rem ---------------------------------------------------------------
 set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 
-call bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/examples/hbsqlit2/tests/bld_b32.bat b/harbour/contrib/examples/hbsqlit2/tests/bld_b32.bat
index b825d9d8d1..147e3c9dc3 100644
--- a/harbour/contrib/examples/hbsqlit2/tests/bld_b32.bat
+++ b/harbour/contrib/examples/hbsqlit2/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbsqlit2.lib sqlite2.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/examples/hbsqlit2/tests/bld_vc.bat b/harbour/contrib/examples/hbsqlit2/tests/bld_vc.bat
index 432e1cebaf..8f9726935f 100644
--- a/harbour/contrib/examples/hbsqlit2/tests/bld_vc.bat
+++ b/harbour/contrib/examples/hbsqlit2/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbsqlit2.lib sqlite2.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/gtwvg/tests/bld_b32.bat b/harbour/contrib/gtwvg/tests/bld_b32.bat
index 6f5679921f..5ac1db9ea4 100644
--- a/harbour/contrib/gtwvg/tests/bld_b32.bat
+++ b/harbour/contrib/gtwvg/tests/bld_b32.bat
@@ -12,4 +12,4 @@ set HB_COMPILER=bcc32
 set HB_USER_LIBS=gtwvg.lib
 set C_USR=-tW
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/gtwvg/tests/bld_vc.bat b/harbour/contrib/gtwvg/tests/bld_vc.bat
index e52bd1749f..5931012f98 100644
--- a/harbour/contrib/gtwvg/tests/bld_vc.bat
+++ b/harbour/contrib/gtwvg/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=gtwvg.lib comdlg32.lib comctl32.lib shell32.lib ole32.lib oleaut32.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbapollo/tests/bld_b32.bat b/harbour/contrib/hbapollo/tests/bld_b32.bat
index 045d2c5f7e..ceb0e83139 100644
--- a/harbour/contrib/hbapollo/tests/bld_b32.bat
+++ b/harbour/contrib/hbapollo/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbapollo.lib sde61.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbapollo/tests/bld_vc.bat b/harbour/contrib/hbapollo/tests/bld_vc.bat
index f0ce72dc05..dc0399ccfd 100644
--- a/harbour/contrib/hbapollo/tests/bld_vc.bat
+++ b/harbour/contrib/hbapollo/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbapollo.lib sde61.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbclipsm/tests/bld_b32.bat b/harbour/contrib/hbclipsm/tests/bld_b32.bat
index 93bf6548da..557218e458 100644
--- a/harbour/contrib/hbclipsm/tests/bld_b32.bat
+++ b/harbour/contrib/hbclipsm/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbclipsm.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbclipsm/tests/bld_vc.bat b/harbour/contrib/hbclipsm/tests/bld_vc.bat
index b90c58b03a..6dc03b4e41 100644
--- a/harbour/contrib/hbclipsm/tests/bld_vc.bat
+++ b/harbour/contrib/hbclipsm/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbclipsm.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbct/tests/bld_b32.bat b/harbour/contrib/hbct/tests/bld_b32.bat
index 4266587812..628462e983 100644
--- a/harbour/contrib/hbct/tests/bld_b32.bat
+++ b/harbour/contrib/hbct/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbct.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbct/tests/bld_vc.bat b/harbour/contrib/hbct/tests/bld_vc.bat
index c1e9c94f62..52ce1fbe80 100644
--- a/harbour/contrib/hbct/tests/bld_vc.bat
+++ b/harbour/contrib/hbct/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbct.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbcurl/tests/bld_b32.bat b/harbour/contrib/hbcurl/tests/bld_b32.bat
index 591b83bae6..ff03fb0897 100644
--- a/harbour/contrib/hbcurl/tests/bld_b32.bat
+++ b/harbour/contrib/hbcurl/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbcurl.lib libcurl.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbcurl/tests/bld_vc.bat b/harbour/contrib/hbcurl/tests/bld_vc.bat
index 67ba67ae7a..4baae82ced 100644
--- a/harbour/contrib/hbcurl/tests/bld_vc.bat
+++ b/harbour/contrib/hbcurl/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbcurl.lib libcurl.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbfbird/tests/bld_b32.bat b/harbour/contrib/hbfbird/tests/bld_b32.bat
index 4547868ee8..f75127fef4 100644
--- a/harbour/contrib/hbfbird/tests/bld_b32.bat
+++ b/harbour/contrib/hbfbird/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbfbird.lib fbclient.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbfbird/tests/bld_vc.bat b/harbour/contrib/hbfbird/tests/bld_vc.bat
index af8801d315..fe0954b984 100644
--- a/harbour/contrib/hbfbird/tests/bld_vc.bat
+++ b/harbour/contrib/hbfbird/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbfbird.lib fbclient.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbfimage/tests/bld_b32.bat b/harbour/contrib/hbfimage/tests/bld_b32.bat
index 50cd025693..28a1a15f6e 100644
--- a/harbour/contrib/hbfimage/tests/bld_b32.bat
+++ b/harbour/contrib/hbfimage/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbfimage.lib freeimage.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbfimage/tests/bld_vc.bat b/harbour/contrib/hbfimage/tests/bld_vc.bat
index 463e2afd43..44c206fe7f 100644
--- a/harbour/contrib/hbfimage/tests/bld_vc.bat
+++ b/harbour/contrib/hbfimage/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbfimage.lib freeimage.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbgd/tests/bld_b32.bat b/harbour/contrib/hbgd/tests/bld_b32.bat
index 6cc0ebb4bb..63fefdc7c4 100644
--- a/harbour/contrib/hbgd/tests/bld_b32.bat
+++ b/harbour/contrib/hbgd/tests/bld_b32.bat
@@ -13,4 +13,4 @@ set HB_USER_LIBS=hbgd.lib bgd.lib hbct.lib
 rem ; uncomment if needed
 rem set C_USR=-tW
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbgd/tests/bld_vc.bat b/harbour/contrib/hbgd/tests/bld_vc.bat
index d38cbc01c2..c0076a2536 100644
--- a/harbour/contrib/hbgd/tests/bld_vc.bat
+++ b/harbour/contrib/hbgd/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbgd.lib bgd.lib hbct.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbgf/tests/bld_b32.bat b/harbour/contrib/hbgf/tests/bld_b32.bat
index 12c194e76b..709a81a151 100644
--- a/harbour/contrib/hbgf/tests/bld_b32.bat
+++ b/harbour/contrib/hbgf/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbgfwin.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbgf/tests/bld_vc.bat b/harbour/contrib/hbgf/tests/bld_vc.bat
index dd73b9c687..ad56b4ab89 100644
--- a/harbour/contrib/hbgf/tests/bld_vc.bat
+++ b/harbour/contrib/hbgf/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbgfwin.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbhpdf/tests/bld_b32.bat b/harbour/contrib/hbhpdf/tests/bld_b32.bat
index 4d3572f111..7e33094f51 100644
--- a/harbour/contrib/hbhpdf/tests/bld_b32.bat
+++ b/harbour/contrib/hbhpdf/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbhpdf.lib libhpdf.lib hbct.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbhpdf/tests/bld_vc.bat b/harbour/contrib/hbhpdf/tests/bld_vc.bat
index c3047f8287..acd1d2afb0 100644
--- a/harbour/contrib/hbhpdf/tests/bld_vc.bat
+++ b/harbour/contrib/hbhpdf/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbhpdf.lib libhpdf.lib hbct.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbmisc/tests/bld_b32.bat b/harbour/contrib/hbmisc/tests/bld_b32.bat
index 6068e154c8..64a32db9e7 100644
--- a/harbour/contrib/hbmisc/tests/bld_b32.bat
+++ b/harbour/contrib/hbmisc/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbmisc.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbmisc/tests/bld_vc.bat b/harbour/contrib/hbmisc/tests/bld_vc.bat
index 8c30804acf..24aa9b9194 100644
--- a/harbour/contrib/hbmisc/tests/bld_vc.bat
+++ b/harbour/contrib/hbmisc/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbmisc.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbmysql/tests/bld_b32.bat b/harbour/contrib/hbmysql/tests/bld_b32.bat
index c73a36a4b9..52c94c860b 100644
--- a/harbour/contrib/hbmysql/tests/bld_b32.bat
+++ b/harbour/contrib/hbmysql/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbmysql.lib libmysql.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbmysql/tests/bld_vc.bat b/harbour/contrib/hbmysql/tests/bld_vc.bat
index dce94a7535..9c5d8b2435 100644
--- a/harbour/contrib/hbmysql/tests/bld_vc.bat
+++ b/harbour/contrib/hbmysql/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbmysql.lib libmysql.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbmzip/tests/bld_b32.bat b/harbour/contrib/hbmzip/tests/bld_b32.bat
index 536d3b01e3..f1ce143c7a 100644
--- a/harbour/contrib/hbmzip/tests/bld_b32.bat
+++ b/harbour/contrib/hbmzip/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbmzip.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbmzip/tests/bld_vc.bat b/harbour/contrib/hbmzip/tests/bld_vc.bat
index 80e768238e..d19ad24b59 100644
--- a/harbour/contrib/hbmzip/tests/bld_vc.bat
+++ b/harbour/contrib/hbmzip/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbmzip.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbnf/tests/bld_b32.bat b/harbour/contrib/hbnf/tests/bld_b32.bat
index e386ad5e92..8c0da24e7a 100644
--- a/harbour/contrib/hbnf/tests/bld_b32.bat
+++ b/harbour/contrib/hbnf/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbnf.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbnf/tests/bld_vc.bat b/harbour/contrib/hbnf/tests/bld_vc.bat
index f8837e026f..fc4671a088 100644
--- a/harbour/contrib/hbnf/tests/bld_vc.bat
+++ b/harbour/contrib/hbnf/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbnf.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbodbc/tests/bld_b32.bat b/harbour/contrib/hbodbc/tests/bld_b32.bat
index 43e021947d..cdf5198fc7 100644
--- a/harbour/contrib/hbodbc/tests/bld_b32.bat
+++ b/harbour/contrib/hbodbc/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbodbc.lib odbc32.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbodbc/tests/bld_vc.bat b/harbour/contrib/hbodbc/tests/bld_vc.bat
index a140f7dfae..36cb55a4fd 100644
--- a/harbour/contrib/hbodbc/tests/bld_vc.bat
+++ b/harbour/contrib/hbodbc/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbodbc.lib odbc32.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbole/tests/bld_b32.bat b/harbour/contrib/hbole/tests/bld_b32.bat
index ed5e7af5a7..435f0b1255 100644
--- a/harbour/contrib/hbole/tests/bld_b32.bat
+++ b/harbour/contrib/hbole/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbole.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbole/tests/bld_vc.bat b/harbour/contrib/hbole/tests/bld_vc.bat
index 0aa4252671..c6a7a8b7a8 100644
--- a/harbour/contrib/hbole/tests/bld_vc.bat
+++ b/harbour/contrib/hbole/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbole.lib ole32.lib oleaut32.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbpgsql/tests/bld_b32.bat b/harbour/contrib/hbpgsql/tests/bld_b32.bat
index 8714ded2fb..ff681a264e 100644
--- a/harbour/contrib/hbpgsql/tests/bld_b32.bat
+++ b/harbour/contrib/hbpgsql/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbpgsql.lib libpq.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbpgsql/tests/bld_vc.bat b/harbour/contrib/hbpgsql/tests/bld_vc.bat
index 0b1e59628f..f472becca6 100644
--- a/harbour/contrib/hbpgsql/tests/bld_vc.bat
+++ b/harbour/contrib/hbpgsql/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbpgsql.lib libpq.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbsqlit3/tests/bld_b32.bat b/harbour/contrib/hbsqlit3/tests/bld_b32.bat
index d6a59cd561..6362937da7 100644
--- a/harbour/contrib/hbsqlit3/tests/bld_b32.bat
+++ b/harbour/contrib/hbsqlit3/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbsqlit3.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbsqlit3/tests/bld_vc.bat b/harbour/contrib/hbsqlit3/tests/bld_vc.bat
index aa08b6128b..d84a4478ef 100644
--- a/harbour/contrib/hbsqlit3/tests/bld_vc.bat
+++ b/harbour/contrib/hbsqlit3/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbsqlit3.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbtip/tests/bld_b32.bat b/harbour/contrib/hbtip/tests/bld_b32.bat
index c18210c302..f60fcfc6d4 100644
--- a/harbour/contrib/hbtip/tests/bld_b32.bat
+++ b/harbour/contrib/hbtip/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbtip.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbtip/tests/bld_vc.bat b/harbour/contrib/hbtip/tests/bld_vc.bat
index 68c7332009..93b05f8dcc 100644
--- a/harbour/contrib/hbtip/tests/bld_vc.bat
+++ b/harbour/contrib/hbtip/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbtip.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbtpathy/tests/bld_b32.bat b/harbour/contrib/hbtpathy/tests/bld_b32.bat
index b96bda9f4d..8fcf322508 100644
--- a/harbour/contrib/hbtpathy/tests/bld_b32.bat
+++ b/harbour/contrib/hbtpathy/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbtpathy.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbtpathy/tests/bld_vc.bat b/harbour/contrib/hbtpathy/tests/bld_vc.bat
index 13ec7942fe..209a2919f6 100644
--- a/harbour/contrib/hbtpathy/tests/bld_vc.bat
+++ b/harbour/contrib/hbtpathy/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbtpathy.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbvpdf/tests/bld_b32.bat b/harbour/contrib/hbvpdf/tests/bld_b32.bat
index 92853fee91..9ba2dfcab2 100644
--- a/harbour/contrib/hbvpdf/tests/bld_b32.bat
+++ b/harbour/contrib/hbvpdf/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbvpdf.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbvpdf/tests/bld_vc.bat b/harbour/contrib/hbvpdf/tests/bld_vc.bat
index 387bcb5bce..d5d700a1f2 100644
--- a/harbour/contrib/hbvpdf/tests/bld_vc.bat
+++ b/harbour/contrib/hbvpdf/tests/bld_vc.bat
@@ -15,4 +15,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbvpdf.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbwhat/tests/bld_b32.bat b/harbour/contrib/hbwhat/tests/bld_b32.bat
index fb9fb01505..6e1cd2f8e9 100644
--- a/harbour/contrib/hbwhat/tests/bld_b32.bat
+++ b/harbour/contrib/hbwhat/tests/bld_b32.bat
@@ -12,4 +12,4 @@ set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbwhat.lib gtwvg.lib xhb.lib
 set C_USR=-tW
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbwhat/tests/bld_vc.bat b/harbour/contrib/hbwhat/tests/bld_vc.bat
index 2df26670f9..a999e55865 100644
--- a/harbour/contrib/hbwhat/tests/bld_vc.bat
+++ b/harbour/contrib/hbwhat/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbwhat.lib gtwvg.lib xhb.lib comdlg32.lib comctl32.lib shell32.lib ole32.lib oleaut32.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbwin/tests/bld_b32.bat b/harbour/contrib/hbwin/tests/bld_b32.bat
index 0437cec067..7bc0c010d5 100644
--- a/harbour/contrib/hbwin/tests/bld_b32.bat
+++ b/harbour/contrib/hbwin/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbwin.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbwin/tests/bld_vc.bat b/harbour/contrib/hbwin/tests/bld_vc.bat
index b503b112ab..ae8bb8c13c 100644
--- a/harbour/contrib/hbwin/tests/bld_vc.bat
+++ b/harbour/contrib/hbwin/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbwin.lib ole32.lib oleaut32.lib winspool.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbziparc/tests/bld_b32.bat b/harbour/contrib/hbziparc/tests/bld_b32.bat
index 834ff7f1ef..f5d27fe06e 100644
--- a/harbour/contrib/hbziparc/tests/bld_b32.bat
+++ b/harbour/contrib/hbziparc/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=hbziparc.lib hbmzip.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbziparc/tests/bld_vc.bat b/harbour/contrib/hbziparc/tests/bld_vc.bat
index 40dd879094..da82725701 100644
--- a/harbour/contrib/hbziparc/tests/bld_vc.bat
+++ b/harbour/contrib/hbziparc/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=hbziparc.lib hbmzip.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/rddado/tests/bld_b32.bat b/harbour/contrib/rddado/tests/bld_b32.bat
index 2acecae298..13e6ee6eda 100644
--- a/harbour/contrib/rddado/tests/bld_b32.bat
+++ b/harbour/contrib/rddado/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=rddado.lib hbusrrdd.lib hbw32.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/rddado/tests/bld_vc.bat b/harbour/contrib/rddado/tests/bld_vc.bat
index 35c8f6d089..a2961b39fe 100644
--- a/harbour/contrib/rddado/tests/bld_vc.bat
+++ b/harbour/contrib/rddado/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=rddado.lib hbusrrdd.lib hbw32.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/rddads/tests/bld_b32.bat b/harbour/contrib/rddads/tests/bld_b32.bat
index d3434ce4ac..6acbbb0b85 100644
--- a/harbour/contrib/rddads/tests/bld_b32.bat
+++ b/harbour/contrib/rddads/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=rddads.lib ace32.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/rddads/tests/bld_vc.bat b/harbour/contrib/rddads/tests/bld_vc.bat
index 4a9781ae6e..25df4c2da4 100644
--- a/harbour/contrib/rddads/tests/bld_vc.bat
+++ b/harbour/contrib/rddads/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=rddads.lib ace32.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/xhb/tests/bld_b32.bat b/harbour/contrib/xhb/tests/bld_b32.bat
index ea28394330..e28206cdc8 100644
--- a/harbour/contrib/xhb/tests/bld_b32.bat
+++ b/harbour/contrib/xhb/tests/bld_b32.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=xhb.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/xhb/tests/bld_vc.bat b/harbour/contrib/xhb/tests/bld_vc.bat
index 2c065ff32c..6a475d6f80 100644
--- a/harbour/contrib/xhb/tests/bld_vc.bat
+++ b/harbour/contrib/xhb/tests/bld_vc.bat
@@ -11,4 +11,4 @@ set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=xhb.lib
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/source/common/hbgete.c b/harbour/source/common/hbgete.c
index f2bff77b96..babfc27fee 100644
--- a/harbour/source/common/hbgete.c
+++ b/harbour/source/common/hbgete.c
@@ -142,9 +142,9 @@ BOOL hb_getenv_buffer( const char * szName, char * szBuffer, int nSize )
 
       if( pszTemp != NULL )
       {
+         bRetVal = TRUE;
          if( szBuffer != NULL && nSize != 0 )
             hb_strncpy( szBuffer, pszTemp, nSize - 1 );
-         bRetVal = TRUE;
       }
    }
 #endif
diff --git a/harbour/tests/bld_b32.bat b/harbour/tests/bld_b32.bat
index 854dbcdd8c..2ddb8aa516 100644
--- a/harbour/tests/bld_b32.bat
+++ b/harbour/tests/bld_b32.bat
@@ -10,4 +10,4 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\include
 set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/tests/bld_vc.bat b/harbour/tests/bld_vc.bat
index ff187b6d19..f5b3ec9c77 100644
--- a/harbour/tests/bld_vc.bat
+++ b/harbour/tests/bld_vc.bat
@@ -10,4 +10,4 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\include
 set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 
-call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9