diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2a79a8c5e3..3003be5373 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-18 16:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed to add windows system libs in mingw -shared mode.
+    + Added some steps towards os2/gcc -shared support.
+
+  * INSTALL
+    * Minor.
+
 2009-09-18 15:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * doc/gmake.txt
   - source/vm/mainpm.c
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 291aadfa78..ef79de9d37 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -218,14 +218,14 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD
    HB_INC_ODBC= (may only be needed on non-Windows systems)
    HB_INC_OPENSSL=C:\openssl\inc32 OR C:\openssl\include
    HB_INC_PCRE=C:\pcre (defaults to locally hosted version if not found)
-   HB_INC_PNG=C:\libpng (defaults to locally hosted version if not found)
    HB_INC_PGSQL=C:\pgsql\include
+   HB_INC_PNG=C:\libpng (defaults to locally hosted version if not found)
    HB_INC_QT=C:\Qt\include
    HB_INC_SLANG= (on *nix systems)
    HB_INC_SQLITE3=C:\sqlite3 (defaults to locally hosted version if not found)
+   HB_INC_WATT= (on MS-DOS systems)
    HB_INC_X11= (on *nix systems)
    HB_INC_ZLIB=C:\zlib (defaults to locally hosted version if not found)
-   HB_INC_WATT= (on MS-DOS systems)
 
    To explicitly disable any given components, use the value 'no' (without
    quotes). This may be useful to avoid autodetection of installed packages
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 2f621eeea8..c0de7ff260 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2345,9 +2345,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          ELSE
             AAdd( hbmk[ _HBMK_aOPTL ], "-o{OE}" )
          ENDIF
-         IF ! hbmk[ _HBMK_lSHARED ]
-            l_aLIBSYS := ArrayAJoin( { l_aLIBSYS, l_aLIBSYSCORE, l_aLIBSYSMISC } )
-         ENDIF
+         l_aLIBSYS := ArrayAJoin( { l_aLIBSYS, l_aLIBSYSCORE, l_aLIBSYSMISC } )
          DO CASE
          CASE hbmk[ _HBMK_cCOMP ] == "mingw64"
             l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-x64",;
@@ -2431,6 +2429,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
             AAdd( hbmk[ _HBMK_aOPTL ], "-o {OE}" )
          ENDIF
 
+         l_aLIBSHARED := { iif( hbmk[ _HBMK_lMT ], "harbourmt" + cDL_Version_Alter + "-os2",;
+                                                   "harbour" + cDL_Version_Alter + "-os2" ) }
+
          cBin_Res := hbmk[ _HBMK_cCCPREFIX ] + "windres" + cCCEXT
          cResExt := ".reso"
          cOpt_Res := "{FR} {IR} -O coff -o {OS}"