diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 160a1d12ee..25cc89cd11 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,20 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-17 16:40 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+   * make_b32.mak
+   * make_vc.mak
+   * common.mak
+   + bin/hbmk.bat
+   * utils/hbmk/Makefile
+   - utils/hbmk/hbmk.prg
+   + utils/hbmk/hbmk2.prg
+    + Renamed hbmk to hbmk2 to avoid collision with hbmk script,
+      and to allow parallel testing.
+    + Readded hbmk.bat to redirect to hbmk2.exe.
+      This will be removed in the future. Win9x/OS/2 isn't
+      supported with this batch file.
+
 2009-02-17 16:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk/hbmk.prg
     * Minor changes.
diff --git a/harbour/bin/hbmk.bat b/harbour/bin/hbmk.bat
new file mode 100644
index 0000000000..2ce9fbe03b
--- /dev/null
+++ b/harbour/bin/hbmk.bat
@@ -0,0 +1,5 @@
+@rem
+@rem $Id$
+@rem
+
+"%~dp0hbmk2.exe" %*
diff --git a/harbour/common.mak b/harbour/common.mak
index 78e071f126..765e575795 100644
--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -282,7 +282,7 @@ HBRUN_EXE    = $(BIN_DIR)\hbrun$(EXEEXT)
 HBTEST_EXE   = $(BIN_DIR)\hbtest$(EXEEXT)
 HBI18N_EXE   = $(BIN_DIR)\hbi18n$(EXEEXT)
 HBDOC_EXE    = $(BIN_DIR)\hbdoc$(EXEEXT)
-HBMK_EXE     = $(BIN_DIR)\hbmk$(EXEEXT)
+HBMK_EXE     = $(BIN_DIR)\hbmk2$(EXEEXT)
 
 HB_DLLVER    = 11
 HARBOUR_DLL  = $(BIN_DIR)\$(LIBPREF)harbour-$(HB_DLLVER)-$(HB_CC_NAME)$(DLLEXT)
@@ -1220,7 +1220,7 @@ HBDOC_EXE_OBJS = \
 #**********************************************************
 
 HBMK_EXE_OBJS = \
-    $(OBJ_DIR)\hbmk$(OBJEXT) \
+    $(OBJ_DIR)\hbmk2$(OBJEXT) \
 
 #**********************************************************
 #**********************************************************
diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak
index 64979f1974..7b2b51e8cb 100644
--- a/harbour/make_b32.mak
+++ b/harbour/make_b32.mak
@@ -714,6 +714,7 @@ doInstall: $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL)
     -if exist $(HB_LIB_INSTALL)\nul if exist $(BIN_DIR)\*.lib copy /B $(BIN_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log
     -if exist $(HB_LIB_INSTALL)\nul if exist $(LIB_DIR)\*.lib copy /B $(LIB_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log
 !if "$(HB_INSTALL_PREFIX)" != "."
+    -if exist $(HB_BIN_INSTALL)\nul copy /B bin\hbmk.bat         $(HB_BIN_INSTALL) >> inst_$(HB_CC_NAME).log
     -if exist $(HB_INC_INSTALL)\nul copy /B $(INCLUDE_DIR)\*.api $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log
     -if exist $(HB_INC_INSTALL)\nul copy /B $(INCLUDE_DIR)\*.ch  $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log
     -if exist $(HB_INC_INSTALL)\nul copy /B $(INCLUDE_DIR)\*.h   $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log
diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak
index 60e8343d45..d988d99b21 100644
--- a/harbour/make_vc.mak
+++ b/harbour/make_vc.mak
@@ -1133,6 +1133,7 @@ doInstall: $(HB_BIN_INSTALL) $(HB_LIB_INSTALL) $(HB_INC_INSTALL)
     -if exist $(HB_LIB_INSTALL)\nul if exist $(BIN_DIR)\*.lib copy /B $(BIN_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log
     -if exist $(HB_LIB_INSTALL)\nul if exist $(LIB_DIR)\*.lib copy /B $(LIB_DIR)\*.lib $(HB_LIB_INSTALL) >> inst_$(HB_CC_NAME).log
 !if "$(HB_INSTALL_PREFIX)" != "."
+    -if exist $(HB_BIN_INSTALL)\nul copy /B bin\hbmk.bat         $(HB_BIN_INSTALL) >> inst_$(HB_CC_NAME).log
     -if exist $(HB_INC_INSTALL)\nul copy /B $(INCLUDE_DIR)\*.api $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log
     -if exist $(HB_INC_INSTALL)\nul copy /B $(INCLUDE_DIR)\*.ch  $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log
     -if exist $(HB_INC_INSTALL)\nul copy /B $(INCLUDE_DIR)\*.h   $(HB_INC_INSTALL) >> inst_$(HB_CC_NAME).log
diff --git a/harbour/utils/hbmk/Makefile b/harbour/utils/hbmk/Makefile
index 1af77fa94a..680630bbd6 100644
--- a/harbour/utils/hbmk/Makefile
+++ b/harbour/utils/hbmk/Makefile
@@ -9,9 +9,9 @@ endif
 ROOT = ../../
 
 PRG_SOURCES=\
-	hbmk.prg \
+	hbmk2.prg \
 
-PRG_MAIN=hbmk.prg
+PRG_MAIN=hbmk2.prg
 
 LIBS=\
 	hbdebug \
diff --git a/harbour/utils/hbmk/hbmk.prg b/harbour/utils/hbmk/hbmk2.prg
similarity index 100%
rename from harbour/utils/hbmk/hbmk.prg
rename to harbour/utils/hbmk/hbmk2.prg