diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 60b64074ae..ce1d4d8e08 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-04-29 20:26 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Refixed -map option for *nix non-darwin systems. Well,
+      at least for Linux.
+
 2009-04-29 19:44 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     + Added support for macros in -l options.
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 3aa3e79e42..ecb23b47e6 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1508,7 +1508,11 @@ FUNCTION hbmk( aArgs )
             ENDIF
          ENDIF
          IF s_lMAP
-            AAdd( s_aOPTL, "-Wl,-map,{OM}" )
+            IF s_cARCH == "darwin"
+               AAdd( s_aOPTL, "-Wl,-map,{OM}" )
+            ELSE
+               AAdd( s_aOPTL, "-Wl,-Map,{OM}" )
+            ENDIF
          ENDIF
          IF s_lSTATICFULL
             AAdd( s_aOPTL, "-static" )