diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d9ad610061..f5f4b5754f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -10,6 +10,21 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-11-22 16:55 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+    + added support for .hbc autofind in contrib and addons
+      dir, even if the .hbc names isn't the same as the
+      contrib name. This can be used to autofind secondary
+      supplementary or alternative .hbc files automatically
+      on all platforms.
+
+  * contrib/hbwin/tests/olesrv1.hbp
+  * contrib/hbwin/tests/olesrv2.hbp
+  * contrib/hbwin/tests/olesrv3.hbp
+  * contrib/hbwin/tests/olesrv4.hbp
+    % deleted relative paths from .hbc references to
+      supplementary .hbc file. They will now be autofound.
+
 2012-11-22 16:34 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbwin/tests/olesrv1.hbp
   * contrib/hbwin/tests/olesrv2.hbp
diff --git a/harbour/contrib/hbwin/tests/olesrv1.hbp b/harbour/contrib/hbwin/tests/olesrv1.hbp
index 122022949f..81fc613df5 100644
--- a/harbour/contrib/hbwin/tests/olesrv1.hbp
+++ b/harbour/contrib/hbwin/tests/olesrv1.hbp
@@ -4,7 +4,7 @@
 
 -hbdynvm
 
-../hbolesrv.hbc
+hbolesrv.hbc
 
 olesrv1.prg
 
diff --git a/harbour/contrib/hbwin/tests/olesrv2.hbp b/harbour/contrib/hbwin/tests/olesrv2.hbp
index a6543f864f..8103ade721 100644
--- a/harbour/contrib/hbwin/tests/olesrv2.hbp
+++ b/harbour/contrib/hbwin/tests/olesrv2.hbp
@@ -4,6 +4,6 @@
 
 -hbdynvm
 
-../hbolesrv.hbc
+hbolesrv.hbc
 
 olesrv2.prg
diff --git a/harbour/contrib/hbwin/tests/olesrv3.hbp b/harbour/contrib/hbwin/tests/olesrv3.hbp
index 9157cbcbc6..849c82982a 100644
--- a/harbour/contrib/hbwin/tests/olesrv3.hbp
+++ b/harbour/contrib/hbwin/tests/olesrv3.hbp
@@ -4,6 +4,6 @@
 
 -hbdynvm
 
-../hbolesrv.hbc
+hbolesrv.hbc
 
 olesrv3.prg
diff --git a/harbour/contrib/hbwin/tests/olesrv4.hbp b/harbour/contrib/hbwin/tests/olesrv4.hbp
index 5a5de0a875..4682b7d9db 100644
--- a/harbour/contrib/hbwin/tests/olesrv4.hbp
+++ b/harbour/contrib/hbwin/tests/olesrv4.hbp
@@ -4,6 +4,6 @@
 
 -hbdynvm
 
-../hbolesrv.hbc
+hbolesrv.hbc
 
 olesrv4.prg
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index f6e89a033c..a2cae4b1f7 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -9718,6 +9718,10 @@ STATIC FUNCTION HBC_Find( hbmk, cFile, nNesting )
    LOCAL cLibPath
    LOCAL lFound
 
+   LOCAL cDir
+   LOCAL aFile
+   LOCAL tmp
+
    hb_default( @nNesting, 1 )
 
    lFound := .F.
@@ -9731,6 +9735,25 @@ STATIC FUNCTION HBC_Find( hbmk, cFile, nNesting )
             EXIT
          ENDIF
       NEXT
+
+      IF ! lFound
+
+         FOR EACH cDir IN { ;
+            hbmk[ _HBMK_cHB_INSTALL_CON ], ;
+            hbmk[ _HBMK_cHB_INSTALL_ADD ] }
+
+            FOR EACH aFile IN Directory( hb_DirSepAdd( cDir ), "D" )
+               IF hb_FileExists( tmp := hb_DirSepAdd( cDir ) + aFile[ F_NAME ] + hb_ps() + hb_FNameNameExt( cFile ) )
+                  cFile := tmp
+                  lFound := .T.
+                  EXIT
+               ENDIF
+            NEXT
+            IF lFound
+               EXIT
+            ENDIF
+         NEXT
+      ENDIF
    ENDIF
 
    IF lFound