diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 34a3c1357b..31327e3edf 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-28 19:25 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed -map option for mingw family. Strangely its help
+      says '-Wl,-Map FILE' is the format but this only works
+      if FILE exists on disk :/ otherwise it gives an error
+      that FILE isn't found. 'Wl,-Map,FILE' seems to work for
+      all cases. Pbly OS/2 and DJGPP should also be fixed.
+    ! Applied above fix for DJGPP and OS/2 GCC. I didn't test
+      it but probably works the same way as in mingw and *nix
+      gcc.
+
 2009-05-28 19:06 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     + .hbm embedding is now allowed 10 level deep (was 3).
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 3bd138a3a1..9905703efa 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1999,7 +1999,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
             ENDIF
          ENDIF
          IF hbmk[ _HBMK_lMAP ]
-            AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,-Map {OM}" )
+            AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,-Map,{OM}" )
          ENDIF
          IF hbmk[ _HBMK_lSHARED ]
             AAdd( hbmk[ _HBMK_aLIBPATH ], s_cHB_BIN_INSTALL )
@@ -2074,7 +2074,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
          cLibPathSep := " "
          cLibLibExt := ".a"
          IF hbmk[ _HBMK_lMAP ]
-            AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,-Map {OM}" )
+            AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,-Map,{OM}" )
          ENDIF
          IF hbmk[ _HBMK_lSHARED ]
             AAdd( hbmk[ _HBMK_aLIBPATH ], s_cHB_BIN_INSTALL )
@@ -2128,7 +2128,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
             aLIB_BASE2 := ArrayAJoin( { aLIB_BASE2, { "hbcommon", "hbrtl" }, s_aLIBVM } )
          ENDIF
          IF hbmk[ _HBMK_lMAP ]
-            AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,-Map {OM}" )
+            AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,-Map,{OM}" )
          ENDIF
          IF ! hbmk[ _HBMK_lSHARED ]
             s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "m" } )