diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f75a35cbbf..a5828da19a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-20 16:30 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.hbm
+    + Added -km option.
+
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed typo preventing filter keywords to work.
+
 2009-04-20 16:25 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     + -quiet will now suppress command output in case of error.
diff --git a/harbour/utils/hbmk2/hbmk2.hbm b/harbour/utils/hbmk2/hbmk2.hbm
index b7b05aff1f..56607f7950 100644
--- a/harbour/utils/hbmk2/hbmk2.hbm
+++ b/harbour/utils/hbmk2/hbmk2.hbm
@@ -2,5 +2,5 @@
 # $Id$
 #
 
--nulrdd
+-nulrdd -km
 hbmk2.prg
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 5090f8c25e..050bb5936d 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -4224,7 +4224,7 @@ STATIC FUNCTION ArchCompFilter( cItem )
 
    LOCAL cExpr := "( hbmk_ARCH() == Lower( '%1' ) .OR. " +;
                     "hbmk_COMP() == Lower( '%1' ) .OR. " +;
-                    "hbmk_KEYW( Lower( '%' ) ) )"
+                    "hbmk_KEYW( Lower( '%1' ) ) )"
 
    IF ( nStart := At( "{", cItem ) ) > 0 .AND. ;
       !( SubStr( cItem, nStart - 1, 1 ) == "$" ) .AND. ;