diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 01b8a8848d..ab9b593b42 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-05-02 01:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + 'hbmk2 proj' will now build 'proj.hbp' if such file exists.
+      if not, it will build proj.prg like before.
+      Experimental, it's quite useful, but let's see how much
+      confusion does it create.
+
 2011-05-01 23:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     ! show translation author only if there is a translation
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 0405c2b9a1..d7c5d9b55b 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -568,6 +568,8 @@ PROCEDURE _APPMAIN( ... )
          FOR EACH tmp1 IN FN_Expand( tmp, .T. )
             AAdd( aArgsProc, tmp1 )
          NEXT
+      CASE Empty( hb_FNameExt( tmp ) ) .AND. hb_FileExists( hb_FNameExtSet( tmp, ".hbp" ) )
+         AAdd( aArgsProc, hb_FNameExtSet( tmp, ".hbp" ) )
       CASE Lower( Left( tmp, Len( "-target=" ) ) ) == "-target="
          FOR EACH tmp1 IN FN_Expand( SubStr( tmp, Len( "-target=" ) + 1 ), .F. )
             AAdd( aArgsProc, "-target=" + tmp1 )