diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cf1b28e085..28d4acaee0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-18 16:21 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk/hbmk2.prg
+    * '-l-' is now passed to Harbour instead of being considered
+      as a lib spec.
+    * Arch/comp is now case-insensitive in filters too.
+    * Removed GTSTD usage.
+      It caused a stall at startup for BCC, and Ctrl+C had
+      to be pressed to proceed. I didn't investigate further,
+      maybe it's a local problem.
+
 2009-02-18 16:05 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * config/win/bcc32.cf
     * Synced flags with non-GNU make. This adds MT support.
diff --git a/harbour/utils/hbmk/hbmk2.prg b/harbour/utils/hbmk/hbmk2.prg
index 3764e99891..501c6d955d 100644
--- a/harbour/utils/hbmk/hbmk2.prg
+++ b/harbour/utils/hbmk/hbmk2.prg
@@ -62,9 +62,6 @@
 /* TODO: Add support for library creation. */
 /* TODO: Support for more compilers/platforms. */
 
-ANNOUNCE HB_GTSYS
-REQUEST HB_GT_STD_DEFAULT
-
 REQUEST hbm_ARCH
 REQUEST hbm_COMP
 
@@ -515,7 +512,8 @@ FUNCTION Main( ... )
       CASE Lower( Left( cParam, 3 ) ) == "-gt"   ; DEFAULT s_cGT TO SubStr( cParam, 2 )
       CASE Left( cParam, 2 ) == "-o"             ; s_cPROGNAME := DirAdaptPathSep( SubStr( cParam, 3 ) )
       CASE Left( cParam, 2 ) == "-l" .AND. ;
-           Len( cParam ) > 2                     ; AAddNotEmpty( s_aLIBUSER, DirAdaptPathSep( ArchCompFilter( SubStr( cParam, 3 ) ) ) )
+           Len( cParam ) > 2 .AND. ;
+           !( Left( cParam, 3 ) == "-l-" )       ; AAddNotEmpty( s_aLIBUSER, DirAdaptPathSep( ArchCompFilter( SubStr( cParam, 3 ) ) ) )
       CASE Left( cParam, 2 ) == "-L" .AND. ;
            Len( cParam ) > 2                     ; AAddNotEmpty( s_aLIBPATH, DirAdaptPathSep( ArchCompFilter( SubStr( cParam, 3 ) ) ) )
       CASE Left( cParam, 1 ) == "-"              ; AAdd( s_aOPTPRG , DirAdaptPathSep( cParam ) )
@@ -1444,7 +1442,7 @@ STATIC FUNCTION ArchCompFilter( cItem )
    LOCAL xResult
    LOCAL cValue
 
-   LOCAL cExpr := "( hbm_ARCH() == '%1' .OR. hbm_COMP() == '%1' )"
+   LOCAL cExpr := "( hbm_ARCH() == Lower( '%1' ) .OR. hbm_COMP() == Lower( '%1' ) )"
 
    IF ( nStart := At( "{", cItem ) ) > 0 .AND. ;
       ( nEnd := hb_At( "}", cItem, nStart ) ) > 0