diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 176ad61b5c..8d495a3a8a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-17 19:29 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk/hbmk2.prg
+    ! Fixed Linux system location detection to work
+      regardless of the name of the executable.
+
 2009-02-17 18:44 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk/hbmk2.prg
     + More informative messages for HB_COMPILER problems.
diff --git a/harbour/utils/hbmk/hbmk2.prg b/harbour/utils/hbmk/hbmk2.prg
index 9ad56df0c5..b38a06b1a9 100644
--- a/harbour/utils/hbmk/hbmk2.prg
+++ b/harbour/utils/hbmk/hbmk2.prg
@@ -337,13 +337,13 @@ FUNCTION Main( ... )
    IF Empty( GetEnv( "HB_INSTALL_PREFIX" ) )
 
       DO CASE
-      CASE hb_ProgName() == "/opt/harbour/hbmk"
+      CASE hb_DirBase() == "/opt/harbour/"
 
          lSysLoc := .T.
 
          s_cHB_INSTALL_PREFIX := "/opt/harbour"
 
-      CASE hb_ProgName() == "/usr/local/bin/hbmk"
+      CASE hb_DirBase() == "/usr/local/bin/"
 
          lSysLoc := .T.