diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c11c05b1c9..d4fe5101cb 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-06-15 03:28 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+    ! do not try to dynamically load hbwin for registry
+      functions, if the lib is already linked
+    ! allow -hbreg and -hbunreg to be passed when it's
+      renamed to hbrun
+
 2012-06-15 03:17 UTC+0200 Viktor Szakats (harbour syenar.net)
   * bin/3rdpatch.hb
   * contrib/make.hb
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 2a7dc2ea0c..2ed391e7fc 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -583,10 +583,12 @@ PROCEDURE _APPMAIN( ... )
 
    /* Expand wildcard project specs */
 
-   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( hb_PValue( 1 ) ) ) + "|" $ "|.hb|.hrb|"
+   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( hb_PValue( 1 ) ) ) + "|" $ "|.hb|.hrb|" ) .AND. ;
+      !( Left( hb_PValue( 1 ), 6 ) == "-hbreg" .OR. ;
+         Left( hb_PValue( 1 ), 8 ) == "-hbunreg" )
       __hbshell( ... )
       QUIT
    ENDIF
@@ -13007,7 +13009,7 @@ DYNAMIC win_regWrite
 DYNAMIC win_regDelete
 
 STATIC FUNCTION __hbshell_win_reg_self( lRegister, lAllUser )
-   IF ! hbshell_ext_load( "hbwin" )
+   IF ! hb_IsFunction( "__HBEXTERN__HBWIN__" ) .AND. ! hbshell_ext_load( "hbwin" )
       RETURN .F.
    ENDIF
    IF ! hb_IsFunction( "win_regWrite" ) .OR. ;