diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 29d5f5f3a0..9910f4bebf 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,15 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-08-18 15:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + hbmk2 executable if renamed, copied or symlinked to the 
+      name 'harbour', it will make it behave as classic harbour 
+      executable, or IOW it will switch to hbmk2 -hbraw mode in such 
+      scenario. This makes it possible to continue using 'harbour' 
+      as a command even in distros which don't ship with classic 
+      harbour executable.
+
 2011-08-18 11:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbcuied/cu_main.prg
     ! do not reference SVN source tree at runtime (-icon option is enough)
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 5ac2b3fd4e..b975814a5f 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -601,6 +601,7 @@ PROCEDURE _APPMAIN( ... )
       ENDIF
 
       DO CASE
+	  CASE tmp == "harbour"                ; hb_AIns( aArgsProc, 1, "-hbraw", .T. )
       CASE Right( tmp, 5 ) == "hbcmp" .OR. ;
            Left(  tmp, 5 ) == "hbcmp" .OR. ;
            tmp == "clipper"                ; hb_AIns( aArgsProc, 1, "-hbcmp", .T. )