diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ab3425c70d..0fc8cfcbdf 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,10 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-06-26 11:19 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+    % use HBMK_IS_IN() where possible
+
 2012-06-26 11:09 UTC+0200 Viktor Szakats (harbour syenar.net)
   * INSTALL
     * minor update
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 5518022b8a..73b942b076 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -589,7 +589,7 @@ PROCEDURE _APPMAIN( ... )
    IF ( Right( Lower( hb_FNameName( hb_argv( 0 ) ) ), 5 ) == "hbrun" .OR. ;
         Left( Lower( hb_FNameName( hb_argv( 0 ) ) ), 5 ) == "hbrun" .OR. ;
         hb_PValue( 1 ) == "." .OR. ;
-        "|" + Lower( hb_FNameExt( PathSepToSelf( hb_PValue( 1 ) ) ) ) + "|" $ "|.hb|.hrb|.dbf|" ) .AND. ;
+        HBMK_IS_IN( Lower( hb_FNameExt( PathSepToSelf( hb_PValue( 1 ) ) ) ), ".hb|.hrb|.dbf" ) ) .AND. ;
       !( ! Empty( hb_PValue( 1 ) ) .AND. ;
          ( Left( hb_PValue( 1 ), 6 ) == "-hbreg" .OR. ;
            Left( hb_PValue( 1 ), 8 ) == "-hbunreg" ) )
@@ -12451,7 +12451,7 @@ STATIC PROCEDURE __hbshell_ext_static_init()
    FOR tmp := 1 TO nCount
       cName := __dynsGetName( tmp )
       IF LEFTEQUAL( cName, "__HBEXTERN__" ) .AND. ;
-         !( "|" + cName + "|" $ "|__HBEXTERN__HBCPAGE__|" )
+         ! HBMK_IS_IN( cName, "__HBEXTERN__HBCPAGE__" )
          s_hLibExt[ Lower( SubStr( cName, Len( "__HBEXTERN__" ) + 1, Len( cName ) - Len( "__HBEXTERN__" ) - Len( "__" ) ) ) ] := NIL
       ENDIF
    NEXT