diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9ef10bd2cf..231362c651 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,15 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-11-10 21:25 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * extras/hbdoc/hbdoc.hbp
+    + use $hb_pkg_install.hbm
+
+  * utils/hbmk2/pkg_inst.hbm
+    + install executables into Harbour bin dir, but
+      commented with NOTE because hbdoc works only when
+      put in its current directory location.
+
 2012-11-10 20:55 UTC+0100 Viktor Szakats (harbour syenar.net)
   * src/rtl/hbgtcore.c
     * changed HB_GTI_COMPATBUFFER default to be Clipper
diff --git a/harbour/extras/hbdoc/hbdoc.hbp b/harbour/extras/hbdoc/hbdoc.hbp
index a1289b8ec5..76e9a4a2a6 100644
--- a/harbour/extras/hbdoc/hbdoc.hbp
+++ b/harbour/extras/hbdoc/hbdoc.hbp
@@ -2,7 +2,8 @@
 # $Id$
 #
 
--w3 -es2 -l
+-w3 -es2
+-l
 
 -o${hb_name}
 
@@ -18,3 +19,7 @@ genbase.prg
 gentxt.prg
 genhtml.prg
 genxml.prg
+
+# NOTE: hbdoc doesn't work from other locations than
+#       the current one, so we don't install it yet.
+# $hb_pkg_install.hbm
diff --git a/harbour/utils/hbmk2/pkg_inst.hbm b/harbour/utils/hbmk2/pkg_inst.hbm
index 66eef67d76..7cc5491c53 100644
--- a/harbour/utils/hbmk2/pkg_inst.hbm
+++ b/harbour/utils/hbmk2/pkg_inst.hbm
@@ -27,6 +27,9 @@
 {hbdyn&!unix}-instpath=${HB_BIN}/
 {hbdyn&unix}-instpath=${HB_LIB}/
 
+# executable
+{hbexe}-instpath=${HB_BIN}/
+
 # import library on non-*nix
 -instpath=implib:${HB_ADDONS}/${hb_name}/lib/${hb_plat}/${hb_comp}/