diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d23cbac19b..ceefa89455 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-10-22 14:57 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * bin/hbmk_os2.cmd
+    + Added support for HB_MT=yes.
+    + Added support for -mt switch.
+
+  * bin/hbmk.cmd
+    ! Typo in help screen.
+
 2008-10-22 16:00 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * contrib/rddsql/hbsqldd.h
   * contrib/rddsql/sqlbase.c
diff --git a/harbour/bin/hbmk.bat b/harbour/bin/hbmk.bat
index 356efa8cf3..90284155f4 100644
--- a/harbour/bin/hbmk.bat
+++ b/harbour/bin/hbmk.bat
@@ -63,7 +63,7 @@ if "%_HB_MT%" == "MT"  set _HBVM_LIB=hbvmmt
    echo.
    echo   - 'filename' is the .prg filename (without extension in pre-NT systems).
    echo   - Don't forget to create a MAIN() function for you application.
-   echo   - If both -mt and -gui is used, -mt should always be the first.
+   echo   - If both -mt and -gui are used, -mt should always be the first.
    echo   - Environment variables HB_ARCHITECTURE, HB_COMPILER must be set.
    echo     The following values are currently supported:
    echo.
diff --git a/harbour/bin/hbmk_os2.cmd b/harbour/bin/hbmk_os2.cmd
index d3c5e41593..8e0a4477ca 100644
--- a/harbour/bin/hbmk_os2.cmd
+++ b/harbour/bin/hbmk_os2.cmd
@@ -27,8 +27,15 @@ if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin
 if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib
 if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include
 
-if     "%HB_MT%" == "MT" set _HBVM_LIB=hbvmmt
-if not "%HB_MT%" == "MT" set _HBVM_LIB=hbvm
+set _HB_MT=%HB_MT%
+if not "%1" == "-mt" goto NO_MT
+   set _HB_MT=yes
+   shift
+:NO_MT
+
+set _HBVM_LIB=hbvm
+if "%_HB_MT%" == "yes" set _HBVM_LIB=hbvmmt
+if "%_HB_MT%" == "MT"  set _HBVM_LIB=hbvmmt
 
 :START
 
@@ -39,7 +46,7 @@ if not "%HB_MT%" == "MT" set _HBVM_LIB=hbvm
 :HELP
 
    echo.
-   echo Usage: hbmk_os2 filename
+   echo Usage: hbmk_os2 [-mt] filename
    echo.
    echo Notes:
    echo.
@@ -87,3 +94,6 @@ if not "%HB_MT%" == "MT" set _HBVM_LIB=hbvm
    if exist %1.o del %1.o
 
 :END
+
+set _HB_MT=
+set _HBVM_LIB=