diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9ab9c174b2..c5a7321d37 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-18 08:38 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    + Added -map support for djgpp. (untested)
+
 2009-05-18 08:25 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     % bcc hack cleaned.
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 53f1b1a563..753d6dc672 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1993,6 +1993,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             AAdd( hbmk[ _HBMK_aOPTL ], "{LL}" )
             aLIB_BASE2 := ArrayAJoin( { aLIB_BASE2, { "hbcommon", "hbrtl" }, s_aLIBVM } )
          ENDIF
+         IF hbmk[ _HBMK_lMAP ]
+            AAdd( hbmk[ _HBMK_aOPTL ], "-Wl,-Map {OM}" )
+         ENDIF
          IF ! hbmk[ _HBMK_lSHARED ]
             s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "m" } )
          ENDIF