diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 54f8edd8d3..03b464ae7b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,25 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-11 22:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  - examples/hbdoc2
+  + contrib/hbdoc2
+  * contrib/make.hbs
+    + Moved hbdoc2 to contrib area.
+    + Added hbdoc2 to std set of utils built.
+    ; I plan to add hbdoc2 to std build process so that we don't
+      have to ship raw doc files in distros, plus, tools like hbide
+      can use pre-compiled docs for "intellisense" feature. We
+      don't have such pre-compiled file format.
+    ; TODO: Delete hbdoc processing logic and code from hbide and
+            use external calls to hbdoc2 for such tasks (f.e. when
+            compiling "intellisense" database for addon lib.
+
+  * contrib/hbpost.hbm
+    ! Fixed typo in -o option.
+    ! Fixed tricky error in last commit causing workdir
+      to be placed at wrong place.
+
 2010-07-10 19:15 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbqt/qth/HBQPlainTextEdit.qth
   * contrib/hbqt/qtgui/HBQPlainTextEdit.cpp
@@ -28,9 +47,9 @@
 
   * contrib/hbide/ideedit.prg
     + Implemented: vertical display of proto-tip.
-      Now if number or arguments in a funtion prototype are 
-      more than 1, the tip will be presented as vertical 
-      list. An image to this effect will follow in reply to 
+      Now if number or arguments in a funtion prototype are
+      more than 1, the tip will be presented as vertical
+      list. An image to this effect will follow in reply to
       this message.
 
 2010-07-10 12:03 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
@@ -45,9 +64,9 @@
       state when exiting hbIDE. Now <Cancel> option is not provided.
 
     + Implemented: proto-tip highlights the current argument corresponding
-      to the cursor position within the function's opening brace and 
+      to the cursor position within the function's opening brace and
       end of the line.
-      
+
 2010-07-10 10:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbassert.h
     ! Fixed to only enable assert()s when HB_BUILD_DEBUG is activated.
diff --git a/harbour/examples/hbdoc2/genhtml.prg b/harbour/contrib/hbdoc2/genhtml.prg
similarity index 100%
rename from harbour/examples/hbdoc2/genhtml.prg
rename to harbour/contrib/hbdoc2/genhtml.prg
diff --git a/harbour/examples/hbdoc2/gentpl.prg b/harbour/contrib/hbdoc2/gentpl.prg
similarity index 100%
rename from harbour/examples/hbdoc2/gentpl.prg
rename to harbour/contrib/hbdoc2/gentpl.prg
diff --git a/harbour/examples/hbdoc2/gentxt.prg b/harbour/contrib/hbdoc2/gentxt.prg
similarity index 100%
rename from harbour/examples/hbdoc2/gentxt.prg
rename to harbour/contrib/hbdoc2/gentxt.prg
diff --git a/harbour/examples/hbdoc2/genxml.prg b/harbour/contrib/hbdoc2/genxml.prg
similarity index 100%
rename from harbour/examples/hbdoc2/genxml.prg
rename to harbour/contrib/hbdoc2/genxml.prg
diff --git a/harbour/examples/hbdoc2/hbdoc2.ch b/harbour/contrib/hbdoc2/hbdoc2.ch
similarity index 100%
rename from harbour/examples/hbdoc2/hbdoc2.ch
rename to harbour/contrib/hbdoc2/hbdoc2.ch
diff --git a/harbour/examples/hbdoc2/hbdoc2.hbp b/harbour/contrib/hbdoc2/hbdoc2.hbp
similarity index 100%
rename from harbour/examples/hbdoc2/hbdoc2.hbp
rename to harbour/contrib/hbdoc2/hbdoc2.hbp
diff --git a/harbour/examples/hbdoc2/hbdoc2.prg b/harbour/contrib/hbdoc2/hbdoc2.prg
similarity index 100%
rename from harbour/examples/hbdoc2/hbdoc2.prg
rename to harbour/contrib/hbdoc2/hbdoc2.prg
diff --git a/harbour/examples/hbdoc2/tmplates.prg b/harbour/contrib/hbdoc2/tmplates.prg
similarity index 100%
rename from harbour/examples/hbdoc2/tmplates.prg
rename to harbour/contrib/hbdoc2/tmplates.prg
diff --git a/harbour/contrib/hbpost.hbm b/harbour/contrib/hbpost.hbm
index 9ff44e6309..c3ffe46ca7 100644
--- a/harbour/contrib/hbpost.hbm
+++ b/harbour/contrib/hbpost.hbm
@@ -14,7 +14,8 @@
 {HB_BUILD_DEBUG}-debug
 {HB_BUILD_DEBUG}-cflag=-DHB_TR_LEVEL_DEBUG
 
-{hblib|hbimplib}-o../../lib/${hb_plat}/${hb_comp}${hb_build}/
-{hbexe|hbdyn}-o../../bin/${hb_plat}/${hb_comp}${hb_build}/
+{hblib|hbimplib}-o../lib/${hb_plat}/${hb_comp}${hb_build}/
+{hbexe|hbdyn}-o../bin/${hb_plat}/${hb_comp}${hb_build}/
 
--workdir=${hb_outputdir}${hb_work}/${hb_outputname}${hb_workdynsub}
+{hblib|hbimplib}-workdir=../lib/${hb_plat}/${hb_comp}${hb_build}/${hb_work}/${hb_outputname}${hb_workdynsub}
+{hbexe|hbdyn}-workdir=../bin/${hb_plat}/${hb_comp}${hb_build}/${hb_work}/${hb_outputname}${hb_workdynsub}
diff --git a/harbour/contrib/make.hbs b/harbour/contrib/make.hbs
index 6b332b1156..03119e6a1e 100755
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -287,6 +287,7 @@ PROCEDURE GNUMake( ... )
       "xhb/xhb.hbp"                }  /* uses: hbct, hbtip, hbwin */
 
    LOCAL aUtils := {;
+      "hbdoc2/hbdoc2.hbp"          ,;
       "hbnetio/utils/hbnetio.hbp"  ,; /* uses: hbnetio */
       "hbide/hbide.hbp"            }  /* uses: hbxbp, hbqt */