diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8c109f227a..98977990f3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-11-06 20:08 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+    + hbmk2 will now read *.hbr for function/lib pairs
+      instead of only hbmk2.hbr
+
+  * config/postinst.hb
+    * renamed hbmk2.hbr to harbour.hbr
+
+  * INSTALL
+    + added table of content (experimental)
+
 2012-11-06 19:29 UTC+0100 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg
     * minor internal cleanup
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 81ba6014c1..08e075d4c3 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -14,6 +14,26 @@ HARBOUR
 
                                        http://harbour-project.org/
 
+TABLE OF CONTENT
+================
+
+0.  GUARANTEES AND LIABILITY
+1.  HOW TO BUILD AND INSTALL HARBOUR FROM SOURCE
+2.  HOW TO DO A PARTIAL [RE]BUILD
+3.  HOW TO CREATE DISTRIBUTABLE PACKAGES
+4.  HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD
+5.  SUPPORTED PLATFORMS AND C COMPILERS
+6.  OPTIONS AVAILABLE WHEN BUILDING HARBOUR
+7.  DEBUGGING OPTIONS
+8.  EXAMPLES
+9.  HOW TO GET HARBOUR
+10. TROUBLESHOOTING
+11. QUICK START TO BUILD YOUR OWN HARBOUR APPLICATIONS
+12. BUILD HOST-PLATFORM/SHELL - TARGET-PLATFORM/COMPILER COMPATIBILITY MATRIX
+13. LINKS TO EXTERNAL COMPONENTS
+14. HOW TO PARTICIPATE
+15. FOR MORE INFORMATION
+
 
 0. GUARANTEES AND LIABILITY
 ===========================
diff --git a/harbour/config/postinst.hb b/harbour/config/postinst.hb
index 343819abaa..9101d316aa 100644
--- a/harbour/config/postinst.hb
+++ b/harbour/config/postinst.hb
@@ -539,7 +539,7 @@ PROCEDURE mk_hbr( cDestDir )
       ENDIF
    NEXT
 
-   hb_MemoWrit( hb_DirSepAdd( cDestDir ) + "hbmk2.hbr", hb_ZCompress( hb_Serialize( hAll ) ) )
+   hb_MemoWrit( hb_DirSepAdd( cDestDir ) + "harbour.hbr", hb_ZCompress( hb_Serialize( hAll ) ) )
 
    RETURN
 
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 63b17fce8e..bad10d30e0 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -6604,7 +6604,11 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
                   ENDIF
                ENDIF
 
-               IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp := hb_processRun( cCommand /* ,,, @cStdErr */ ) ) != 0
+#ifdef _HBMK_LIB_HINTS_
+               IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp := hb_processRun( cCommand,,, @cStdErr ) ) != 0
+#else
+               IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp := hb_processRun( cCommand  ) ) != 0
+#endif
                   _hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Running linker. %1$d" ), tmp ) )
                   IF ! hbmk[ _HBMK_lQuiet ]
                      OutErr( cCommand + _OUT_EOL )
@@ -6720,7 +6724,11 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
                   ENDIF
                ENDIF
 
-               IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp := hb_processRun( cCommand /* ,,, @cStdErr */ ) ) != 0
+#ifdef _HBMK_LIB_HINTS_
+               IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp := hb_processRun( cCommand,,, @cStdErr ) ) != 0
+#else
+               IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp := hb_processRun( cCommand  ) ) != 0
+#endif
                   _hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Running dynamic lib link command. %1$d" ), tmp ) )
                   IF ! hbmk[ _HBMK_lQuiet ]
                      OutErr( cCommand + _OUT_EOL )
@@ -12312,13 +12320,13 @@ STATIC FUNCTION ExtractHarbourSymbols( cString )
 
 STATIC FUNCTION GetListOfFunctionsKnown( hbmk )
 
-   LOCAL cFileName := hb_DirBase() + _SELF_NAME_ + ".hbr" /* Experimental name. not final. */
+   LOCAL hAll := { => }
+   LOCAL aFile
 
-   LOCAL hAll := iif( hb_FileExists( cFileName ), hb_Deserialize( hb_ZUncompress( hb_MemoRead( cFileName ) ) ), { => } )
-
-   IF ! HB_ISHASH( hAll )
-      hAll := { => }
-   ENDIF
+   FOR EACH aFile IN Directory( hb_DirBase() + "*.hbr" )
+      /* TOFIX: To handle function names present in multiple containers */
+      hb_HMerge( hAll, hb_Deserialize( hb_ZUncompress( hb_MemoRead( hb_DirBase() + aFile[ F_NAME ] ) ) ) )
+   NEXT
 
    hAll[ "HB_COMPILE" ] := ;
    hAll[ "HB_COMPILEBUF" ] := ;