diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b4927a991d..f9c692547b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-23 22:29 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    + Added -map support for owatcom on all platforms.
+
 2009-02-23 22:17 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     ! Fixed bug in path normalization which stripped leading
@@ -262,7 +266,7 @@
     ; TODO: Add BCC support, if possible. [DONE]
     ; TODO: Rename hb-mkslib.sh to 8.3 name and sync
             name with the .bat version (not necessarily
-            mkdll, but something short.)
+            mkdll, but something short.) [DONE]
 
   * bin/hb-func.sh
     ! Added system libs for optional components included
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index c04714befd..6543dc7912 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1136,6 +1136,9 @@ FUNCTION Main( ... )
          IF s_lDEBUG
             cOpt_Link := "DEBUG " + cOpt_Link
          ENDIF
+         IF s_lMAP
+            AAdd( s_aOPTL, "OP MAP" )
+         ENDIF
 
       CASE t_cARCH == "win" .AND. t_cCOMP == "owatcom"
          cLibPrefix := "LIB "
@@ -1151,6 +1154,9 @@ FUNCTION Main( ... )
          IF s_lDEBUG
             cOpt_Link := "DEBUG " + cOpt_Link
          ENDIF
+         IF s_lMAP
+            AAdd( s_aOPTL, "OP MAP" )
+         ENDIF
          s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "kernel32", "user32", "wsock32" } )
 
          IF Len( s_aRESSRC ) > 0
@@ -1212,6 +1218,9 @@ FUNCTION Main( ... )
             IF s_lDEBUG
                cOpt_Link := "DEBUG " + cOpt_Link
             ENDIF
+            IF s_lMAP
+               AAdd( s_aOPTL, "OP MAP" )
+            ENDIF
 
          CASE t_cCOMP == "icc"
             cLibPrefix := NIL
@@ -1245,6 +1254,9 @@ FUNCTION Main( ... )
          IF s_lDEBUG
             cOpt_Link := "DEBUG " + cOpt_Link
          ENDIF
+         IF s_lMAP
+            AAdd( s_aOPTL, "OP MAP" )
+         ENDIF
 
       /* Misc */
       CASE t_cARCH == "win" .AND. t_cCOMP == "bcc32"