diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0199fdc8b8..8e0cf2bc9a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,28 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-10-22 14:51 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * bin/hbmk.bat
+    + Added support for 'set HB_GUI=yes'
+      Currently implemented for BCC32 and MSVC.
+    + Added support for 'set HB_MT=yes' (instead of 'MT')
+      for consistency. MT seems to be an xhb heritage and 
+      it may be removed in the future.
+    + Added support for optional -mt switch as an equivalent 
+      to 'set HB_MT=yes'
+    + Added support for optional -gui switch as an equivalent 
+      to 'set HB_GUI=yes'
+    ; NOTE: Ordering (first -mt, then -gui) and casing (everything 
+            is lowercase) of the above options are significant.
+
+  * bin/hbmk.bat
+  * bin/hbmk_os2.cmd
+    * Help screen cleanup.
+
+  * contrib/gtwvg/tests/bld_vc.bat
+  * contrib/gtwvg/tests/bld_b32.bat
+    * Changed to use HB_GUI=yes instead of C_USR/L_USR.
+
 2008-10-22 14:08 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * tests/rto_get.prg
     + Added tests for assigments as function calls (o:col( 10 ) 
diff --git a/harbour/bin/hbmk.bat b/harbour/bin/hbmk.bat
index 9493ad809e..356efa8cf3 100644
--- a/harbour/bin/hbmk.bat
+++ b/harbour/bin/hbmk.bat
@@ -28,8 +28,24 @@ 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_USR_C=
+set _HB_USR_L=
+
+set _HB_MT=%HB_MT%
+if not "%1" == "-mt" goto NO_MT
+   set _HB_MT=yes
+   shift
+:NO_MT
+
+set _HB_GUI=%HB_GUI%
+if not "%1" == "-gui" goto NO_GUI
+   set _HB_GUI=yes
+   shift
+:NO_GUI
+
+set _HBVM_LIB=hbvm
+if "%_HB_MT%" == "yes" set _HBVM_LIB=hbvmmt
+if "%_HB_MT%" == "MT"  set _HBVM_LIB=hbvmmt
 
 :START
 
@@ -41,15 +57,15 @@ if not "%HB_MT%" == "MT" set _HBVM_LIB=hbvm
 :HELP
 
    echo.
-   echo Usage: bld filename
+   echo Usage: hbmk [-mt] [-gui] filename
    echo.
    echo Notes:
    echo.
-   echo   - 'filename' is the .prg filename _without_ extension.
-   echo   - Don't forget to make a MAIN() function for you application.
-   echo   - This batch file assumes you are in some directory off the main
-   echo     harbour directory.
-   echo   - Environment variables HB_ARCHITECTURE, HB_COMPILER should be set.
+   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   - Environment variables HB_ARCHITECTURE, HB_COMPILER must be set.
+   echo     The following values are currently supported:
    echo.
    echo     HB_ARCHITECTURE:
    echo       - dos
@@ -173,14 +189,18 @@ if not "%HB_MT%" == "MT" set _HBVM_LIB=hbvm
 
    if not "%HB_COMPILER%" == "bcc32" goto A_WIN_BCC_NOT
 
-      bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %C_USR% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_PRG_NAME%.c %HB_USER_LIBS% hbcpage.lib hbdebug.lib %_HBVM_LIB%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddfpt.lib rddntx.lib rddcdx.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib
+      if "%_HB_GUI%" == "yes" set _HB_USR_C=-tW
+
+      bcc32 -q -tWM -O2 -OS -Ov -Oi -Oc -d %C_USR% %_HB_USR_C% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %_HB_PRG_NAME%.c %HB_USER_LIBS% hbcpage.lib hbdebug.lib %_HBVM_LIB%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddfpt.lib rddntx.lib rddcdx.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib
       goto CLEANUP
 
 :A_WIN_BCC_NOT
 
    if not "%HB_COMPILER%" == "msvc" goto A_WIN_MSVC_NOT
 
-      cl -nologo -W3 %C_USR% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /LIBPATH:%HB_LIB_INSTALL% %L_USR% %HB_USER_LIBS% hbcpage.lib hbdebug.lib %_HBVM_LIB%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib wsock32.lib advapi32.lib gdi32.lib
+      if "%_HB_GUI%" == "yes" set _HB_USR_L=/subsystem:windows
+
+      cl -nologo -W3 %C_USR% -I%HB_INC_INSTALL% %_HB_PRG_NAME%.c /link /LIBPATH:%HB_LIB_INSTALL% %L_USR% %_HB_USR_L% %HB_USER_LIBS% hbcpage.lib hbdebug.lib %_HBVM_LIB%.lib hbrtl.lib gtcgi.lib gtgui.lib gtpca.lib gtstd.lib gtwin.lib gtwvt.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbhsx.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib wsock32.lib advapi32.lib gdi32.lib
       goto CLEANUP
 
 :A_WIN_MSVC_NOT
@@ -243,3 +263,9 @@ if not "%HB_MT%" == "MT" set _HBVM_LIB=hbvm
    if exist %_HB_PRG_NAME%.tds del %_HB_PRG_NAME%.tds
 
 :END
+
+set _HB_MT=
+set _HB_GUI=
+set _HBVM_LIB=
+set _HB_USR_C=
+set _HB_USR_L=
diff --git a/harbour/bin/hbmk_os2.cmd b/harbour/bin/hbmk_os2.cmd
index 92217bbe42..d3c5e41593 100644
--- a/harbour/bin/hbmk_os2.cmd
+++ b/harbour/bin/hbmk_os2.cmd
@@ -39,15 +39,13 @@ if not "%HB_MT%" == "MT" set _HBVM_LIB=hbvm
 :HELP
 
    echo.
-   echo Usage: bld filename
+   echo Usage: hbmk_os2 filename
    echo.
    echo Notes:
    echo.
    echo   - 'filename' is the .prg filename _without_ extension.
    echo   - Don't forget to make a MAIN() function for you application.
-   echo   - This batch file assumes you are in some directory off the main
-   echo     harbour directory.
-   echo   - Environment variable HB_COMPILER should be set.
+   echo   - Environment variable HB_COMPILER myst be set.
    echo     The following values are currently supported:
    echo.
    echo     HB_COMPILER:
diff --git a/harbour/contrib/gtwvg/tests/bld_b32.bat b/harbour/contrib/gtwvg/tests/bld_b32.bat
index 5ac1db9ea4..9559b9aa3a 100644
--- a/harbour/contrib/gtwvg/tests/bld_b32.bat
+++ b/harbour/contrib/gtwvg/tests/bld_b32.bat
@@ -10,6 +10,6 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include
 set HB_ARCHITECTURE=w32
 set HB_COMPILER=bcc32
 set HB_USER_LIBS=gtwvg.lib
-set C_USR=-tW
+set HB_GUI=yes
 
 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 b2b3f4d893..b26904e75b 100644
--- a/harbour/contrib/gtwvg/tests/bld_vc.bat
+++ b/harbour/contrib/gtwvg/tests/bld_vc.bat
@@ -10,6 +10,6 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include
 set HB_ARCHITECTURE=w32
 set HB_COMPILER=msvc
 set HB_USER_LIBS=gtwvg.lib comdlg32.lib comctl32.lib shell32.lib ole32.lib oleaut32.lib
-set L_USR=/subsystem:windows
+set HB_GUI=yes
 
 call %HB_BIN_INSTALL%\hbmk.bat %1 %2 %3 %4 %5 %6 %7 %8 %9