diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5bb07c629e..6748d84852 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,13 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-03-26 03:58 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * extras/template/hbtpl.hbc
+  * extras/template/hbtpl.hbp
+  * utils/hbmk2/pkg_inst.hbm
+    + added support and example for alternate header directory
+      in 'include' subdirectory under package root.
+
 2013-03-26 01:47 UTC+0100 Viktor Szakats (harbour syenar.net)
   * config/global.mk
   * config/postinst.hb
diff --git a/extras/template/hbtpl.hbc b/extras/template/hbtpl.hbc
index 0c1d912a83..2ede52f8b7 100644
--- a/extras/template/hbtpl.hbc
+++ b/extras/template/hbtpl.hbc
@@ -2,6 +2,8 @@
 description=Harbour library project template
 
 incpaths=.
+# NOTE: Uncomment if you store headers in this alternate subdirectory
+# incpaths=include
 headers=${hb_name}.ch
 libpaths=lib/${hb_plat}/${hb_comp}
 
diff --git a/extras/template/hbtpl.hbp b/extras/template/hbtpl.hbp
index 99f1b81219..5906eec933 100644
--- a/extras/template/hbtpl.hbp
+++ b/extras/template/hbtpl.hbp
@@ -16,6 +16,9 @@
 # -depimplibd=lib3rd:lib3rd
 # -depfinish=lib3rd
 
+# NOTE: Uncomment if you store headers in this alternate subdirectory
+# -iinclude
+
 core.prg
 corec.c
 
diff --git a/utils/hbmk2/pkg_inst.hbm b/utils/hbmk2/pkg_inst.hbm
index 33d605c012..6a73ff3875 100644
--- a/utils/hbmk2/pkg_inst.hbm
+++ b/utils/hbmk2/pkg_inst.hbm
@@ -11,6 +11,7 @@
 -instfile=misc:*.hbc
 -instfile=misc:*.txt
 -instfile=inc:*.ch
+-instfile=inc_sub:include/*.ch
 -instfile=inc:*.hbx
 -instfile=tests:tests/*.*
 
@@ -39,4 +40,5 @@
 # misc files, public headers, tests
 -instpath=misc:${HB_ADDONS}/${hb_name}/
 -instpath=inc:${HB_ADDONS}/${hb_name}/
+-instpath=inc_sub:${HB_ADDONS}/${hb_name}/include/
 -instpath=tests:${HB_ADDONS}/${hb_name}/tests/