diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 589b8a4044..fbd970171c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,59 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-29 18:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   - utils/hbformat/hbformat.hbm
+   + utils/hbformat/hbformat.hbp
+   - utils/hbmk2/hbmk2.hbm
+   + utils/hbmk2/hbmk2.hbp
+   - utils/hbtest/hbtest.hbm
+   + utils/hbtest/hbtest.hbp
+   + utils/hbi18n/hbi18n.hbp
+   - utils/hbi18n/hbi18n.hbm
+   - utils/hbrun/hbrun.hbm
+   + utils/hbrun/hbrun.hbp
+   - contrib/hbbtree/tests/test.hbm
+   + contrib/hbbtree/tests/test.hbp
+   - examples/pp/pp.hbm
+   + examples/pp/pp.hbp
+   - examples/hbdoc/hbdoc.hbm
+   + examples/hbdoc/hbdoc.hbp
+   + examples/superlib/hbsuper.hbp
+   - examples/superlib/hbsuper.hbm
+   + examples/hbsqlit2/hbsqlit2.hbp
+   - examples/hbsqlit2/hbsqlit2.hbm
+   + examples/hboleold/hboleold.hbp
+   - examples/hboleold/hboleold.hbm
+   - examples/hbapollo/hbapollo.hbm
+   + examples/hbapollo/hbapollo.hbp
+   - examples/pe/pe.hbm
+   + examples/pe/pe.hbp
+   - examples/guestbk/guestbk.hbm
+   + examples/guestbk/guestbk.hbp
+   - examples/hbgf/hbgfwin/hbgfwin.hbm
+   + examples/hbgf/hbgfwin/hbgfwin.hbp
+   - examples/hbgf/hbgfos2/hbgfos2.hbm
+   + examples/hbgf/hbgfos2/hbgfos2.hbp
+   - examples/hbgf/hbgfgtk/hbgfgtk.hbm
+   + examples/hbgf/hbgfgtk/hbgfgtk.hbp
+   + examples/uhttpd/uhttpd.hbp
+   - examples/uhttpd/uhttpdgd.hbm
+   + examples/uhttpd/uhttpdgd.hbp
+   + examples/uhttpd/modules/allmod.hbp
+   - examples/uhttpd/modules/allmod.hbm
+   - examples/uhttpd/uhttpd.hbm
+   - examples/dbu/dbu.hbm
+   + examples/dbu/dbu.hbp
+   - examples/hscript/hscript.hbm
+   + examples/hscript/hscript.hbp
+   - examples/hbwhat/hbwhat.hbm
+   + examples/hbwhat/hbwhat.hbp
+   - examples/rl/rl.hbm
+   + examples/rl/rl.hbp
+     * Renamed .hbm files to .hbp. So f.e. now it's possible to build
+       multiple of these from one hbmk2 command and it's also more obvious
+       that an .hbp files is a project (target).
+
 2009-05-29 18:31 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.pt_BR.po
   * utils/hbmk2/hbmk2.hu_HU.po
diff --git a/harbour/contrib/hbbtree/tests/test.hbm b/harbour/contrib/hbbtree/tests/test.hbp
similarity index 100%
rename from harbour/contrib/hbbtree/tests/test.hbm
rename to harbour/contrib/hbbtree/tests/test.hbp
diff --git a/harbour/examples/dbu/dbu.hbm b/harbour/examples/dbu/dbu.hbp
similarity index 100%
rename from harbour/examples/dbu/dbu.hbm
rename to harbour/examples/dbu/dbu.hbp
diff --git a/harbour/examples/guestbk/guestbk.hbm b/harbour/examples/guestbk/guestbk.hbp
similarity index 100%
rename from harbour/examples/guestbk/guestbk.hbm
rename to harbour/examples/guestbk/guestbk.hbp
diff --git a/harbour/examples/hbapollo/hbapollo.hbm b/harbour/examples/hbapollo/hbapollo.hbp
similarity index 100%
rename from harbour/examples/hbapollo/hbapollo.hbm
rename to harbour/examples/hbapollo/hbapollo.hbp
diff --git a/harbour/examples/hbdoc/hbdoc.hbm b/harbour/examples/hbdoc/hbdoc.hbp
similarity index 100%
rename from harbour/examples/hbdoc/hbdoc.hbm
rename to harbour/examples/hbdoc/hbdoc.hbp
diff --git a/harbour/examples/hbgf/hbgfgtk/hbgfgtk.hbm b/harbour/examples/hbgf/hbgfgtk/hbgfgtk.hbp
similarity index 100%
rename from harbour/examples/hbgf/hbgfgtk/hbgfgtk.hbm
rename to harbour/examples/hbgf/hbgfgtk/hbgfgtk.hbp
diff --git a/harbour/examples/hbgf/hbgfos2/hbgfos2.hbm b/harbour/examples/hbgf/hbgfos2/hbgfos2.hbp
similarity index 100%
rename from harbour/examples/hbgf/hbgfos2/hbgfos2.hbm
rename to harbour/examples/hbgf/hbgfos2/hbgfos2.hbp
diff --git a/harbour/examples/hbgf/hbgfwin/hbgfwin.hbm b/harbour/examples/hbgf/hbgfwin/hbgfwin.hbp
similarity index 100%
rename from harbour/examples/hbgf/hbgfwin/hbgfwin.hbm
rename to harbour/examples/hbgf/hbgfwin/hbgfwin.hbp
diff --git a/harbour/examples/hboleold/hboleold.hbm b/harbour/examples/hboleold/hboleold.hbp
similarity index 100%
rename from harbour/examples/hboleold/hboleold.hbm
rename to harbour/examples/hboleold/hboleold.hbp
diff --git a/harbour/examples/hbsqlit2/hbsqlit2.hbm b/harbour/examples/hbsqlit2/hbsqlit2.hbp
similarity index 100%
rename from harbour/examples/hbsqlit2/hbsqlit2.hbm
rename to harbour/examples/hbsqlit2/hbsqlit2.hbp
diff --git a/harbour/examples/hbwhat/hbwhat.hbm b/harbour/examples/hbwhat/hbwhat.hbp
similarity index 100%
rename from harbour/examples/hbwhat/hbwhat.hbm
rename to harbour/examples/hbwhat/hbwhat.hbp
diff --git a/harbour/examples/hscript/hscript.hbm b/harbour/examples/hscript/hscript.hbp
similarity index 100%
rename from harbour/examples/hscript/hscript.hbm
rename to harbour/examples/hscript/hscript.hbp
diff --git a/harbour/examples/pe/pe.hbm b/harbour/examples/pe/pe.hbp
similarity index 100%
rename from harbour/examples/pe/pe.hbm
rename to harbour/examples/pe/pe.hbp
diff --git a/harbour/examples/pp/pp.hbm b/harbour/examples/pp/pp.hbp
similarity index 100%
rename from harbour/examples/pp/pp.hbm
rename to harbour/examples/pp/pp.hbp
diff --git a/harbour/examples/rl/rl.hbm b/harbour/examples/rl/rl.hbp
similarity index 100%
rename from harbour/examples/rl/rl.hbm
rename to harbour/examples/rl/rl.hbp
diff --git a/harbour/examples/superlib/hbsuper.hbm b/harbour/examples/superlib/hbsuper.hbp
similarity index 99%
rename from harbour/examples/superlib/hbsuper.hbm
rename to harbour/examples/superlib/hbsuper.hbp
index bae08633d7..62df9c9e21 100644
--- a/harbour/examples/superlib/hbsuper.hbm
+++ b/harbour/examples/superlib/hbsuper.hbp
@@ -3,7 +3,7 @@
 #
 
 -hblib
--ohbsuper
+-osuperlib
 -inc
 -q0 -w1 -es2 -l
 
diff --git a/harbour/examples/uhttpd/modules/allmod.hbm b/harbour/examples/uhttpd/modules/allmod.hbp
similarity index 100%
rename from harbour/examples/uhttpd/modules/allmod.hbm
rename to harbour/examples/uhttpd/modules/allmod.hbp
diff --git a/harbour/examples/uhttpd/uhttpd.hbm b/harbour/examples/uhttpd/uhttpd.hbp
similarity index 100%
rename from harbour/examples/uhttpd/uhttpd.hbm
rename to harbour/examples/uhttpd/uhttpd.hbp
diff --git a/harbour/examples/uhttpd/uhttpdgd.hbm b/harbour/examples/uhttpd/uhttpdgd.hbp
similarity index 100%
rename from harbour/examples/uhttpd/uhttpdgd.hbm
rename to harbour/examples/uhttpd/uhttpdgd.hbp
diff --git a/harbour/utils/hbformat/hbformat.hbm b/harbour/utils/hbformat/hbformat.hbp
similarity index 100%
rename from harbour/utils/hbformat/hbformat.hbm
rename to harbour/utils/hbformat/hbformat.hbp
diff --git a/harbour/utils/hbi18n/hbi18n.hbm b/harbour/utils/hbi18n/hbi18n.hbp
similarity index 100%
rename from harbour/utils/hbi18n/hbi18n.hbm
rename to harbour/utils/hbi18n/hbi18n.hbp
diff --git a/harbour/utils/hbmk2/hbmk2.hbm b/harbour/utils/hbmk2/hbmk2.hbp
similarity index 100%
rename from harbour/utils/hbmk2/hbmk2.hbm
rename to harbour/utils/hbmk2/hbmk2.hbp
diff --git a/harbour/utils/hbrun/hbrun.hbm b/harbour/utils/hbrun/hbrun.hbp
similarity index 100%
rename from harbour/utils/hbrun/hbrun.hbm
rename to harbour/utils/hbrun/hbrun.hbp
diff --git a/harbour/utils/hbtest/hbtest.hbm b/harbour/utils/hbtest/hbtest.hbp
similarity index 100%
rename from harbour/utils/hbtest/hbtest.hbm
rename to harbour/utils/hbtest/hbtest.hbp