diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 127af6b305..06e51b3eac 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,20 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-08 10:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * package/winuni/mpkg_win_uni_extra_copy.bat
+    + Include /doc/* tree in binary distro.
+      This makes code generation and embedding that large amount
+      of generated code into hbide itself (at build time) unnecessary.
+      All hbide needs to do is processing these docs at runtime, and
+      storing the results and index (f.e. as serialized hash into some
+      local cache dir in its setting area). At startup, periodically,
+      or by users request it can rescan the docs and regenerate its
+      caches.
+
+  * utils/hbmk2/hbmk2.prg
+    + Added nesting level information to --hbrefs output.
+
 2010-07-09 00:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/hbqt_hbqplaintextedit.cpp
     ! Changed: threshhold to activate codec ompletion list from 3 to 1.
@@ -31,7 +45,7 @@
   * contrib/hbide/ideharbourhelp.prg
   * contrib/hbide/idesaveload.prg
     + Implemented: in-place Harbour keywords and prototypes as a .prg list.
-      Now no need to have Harbour installed on the machine to have them.    
+      Now no need to have Harbour installed on the machine to have them.
 
 2010-07-08 19:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/hbide.prg
@@ -40,12 +54,12 @@
   * contrib/hbide/ideeditor.prg
   * contrib/hbide/idefunctions.prg
   * contrib/hbide/ideharbourhelp.prg
-    + Implemented: Harbour function definitions which are part of 
-      Harbour documentation files in /doc/en folders viewable in 
+    + Implemented: Harbour function definitions which are part of
+      Harbour documentation files in /doc/en folders viewable in
       Documentation Viewer available as code completion lists.
-      For this to happen, you must have Harbour's root path 
+      For this to happen, you must have Harbour's root path
       provided in Documentation Viewer dialog.
-      So, as an example, if definitions are loaded ok, you 
+      So, as an example, if definitions are loaded ok, you
       must see a list of QWeb*() functions as soon as you type "Web"
       in an editing instance.
 
@@ -55,7 +69,7 @@
   * contrib/hbide/hbide.prg
   * contrib/hbide/idedocks.prg
     ! More fix to previous. Now the visibility of source behavior is Ok.
-   
+
   * contrib/hbide/ideeditor.prg
     ! Changed: numeric to character events notation.
 
diff --git a/harbour/package/winuni/mpkg_win_uni_extra_copy.bat b/harbour/package/winuni/mpkg_win_uni_extra_copy.bat
index 90384ac6ea..0050eaf90e 100644
--- a/harbour/package/winuni/mpkg_win_uni_extra_copy.bat
+++ b/harbour/package/winuni/mpkg_win_uni_extra_copy.bat
@@ -62,6 +62,7 @@ for /F %%a in ( 'dir /b /ad' ) do (
    xcopy /y /s %%a\*.hbc     F:\hb\hb21\contrib\%%a\
    xcopy /y /s %%a\*.hbi     F:\hb\hb21\contrib\%%a\
    xcopy /y /s %%a\*.def     F:\hb\hb21\contrib\%%a\
+   xcopy /y /s %%a\doc\*.*   F:\hb\hb21\contrib\%%a\doc\
    xcopy /y /s %%a\tests\*.* F:\hb\hb21\contrib\%%a\tests\
    xcopy /y /s %%a\utils\*.* F:\hb\hb21\contrib\%%a\utils\
 )
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 9448195685..e3c3fb8199 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -4166,7 +4166,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
    IF lDumpReferences
       OutStd( "hbrefs{{" + hb_eol() )
       FOR EACH tmp IN hbmk[ _HBMK_aDEPTHBC ]
-         OutStd( PathSepToForward( PathNormalize( tmp ) ) + hb_eol() )
+         OutStd( Replicate( Chr( 9 ), tmp[ 2 ] ) + PathSepToForward( PathNormalize( tmp[ 1 ] ) ) + hb_eol() )
       NEXT
       OutStd( "}}" + hb_eol() )
       RETURN 0
@@ -7704,7 +7704,7 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
       RETURN .F.
    ENDIF
 
-   AAddNew( hbmk[ _HBMK_aDEPTHBC ], cFileName )
+   AAddNew( hbmk[ _HBMK_aDEPTHBC ], { cFileName, nNestingLevel - 1 } )
 
    cFile := MemoRead( cFileName ) /* NOTE: Intentionally using MemoRead() which handles EOF char. */