diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 45c865707c..c910eb329a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-29 17:13 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    + Added support for filter keywords 'shared' and 'static'.
+
+  * bin/postinst.bat
+  * utils/hbmk2/hbmk2.hbm
+  * utils/hbrun/hbrun.hbm
+    * Moved extra libs required in shared mode to .hbm files.
+    ! Fixed hbl= -> hbi=
+
 2009-05-29 16:02 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     ! Fix to prev fix reported by Vailton. Could RTE when compiling .hrbs.
diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat
index 3e7e8ba34c..9e7ce1d2ad 100644
--- a/harbour/bin/postinst.bat
+++ b/harbour/bin/postinst.bat
@@ -40,8 +40,8 @@ if not "%HB_DYNLIB%" == "yes" goto _SKIP_DLL_BIN
    setlocal
    if "%HB_BIN_COMPILE%" == "" set HB_BIN_COMPILE=%HB_BIN_INSTALL%
    if exist "%HB_BIN_INSTALL%\*.dll" (
-      %HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbrun-dll    %~dp0..\utils\hbrun\hbrun.hbm -lhbcplr -lhbpp -lhbcommon
-      %HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbmk2-dll    %~dp0..\utils\hbmk2\hbmk2.hbm -lhbcplr -lhbpp -lhbcommon
+      %HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbrun-dll    %~dp0..\utils\hbrun\hbrun.hbm
+      %HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbmk2-dll    %~dp0..\utils\hbmk2\hbmk2.hbm
       %HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbtest-dll   %~dp0..\utils\hbtest\hbtest.hbm
       %HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbi18n-dll   %~dp0..\utils\hbi18n\hbi18n.hbm
       %HB_BIN_COMPILE%\hbmk2 -q0 -shared -o%HB_BIN_INSTALL%\hbformat-dll %~dp0..\utils\hbi18n\hbformat.hbm
diff --git a/harbour/utils/hbmk2/hbmk2.hbm b/harbour/utils/hbmk2/hbmk2.hbm
index 5f0375ffa1..900e861f03 100644
--- a/harbour/utils/hbmk2/hbmk2.hbm
+++ b/harbour/utils/hbmk2/hbmk2.hbm
@@ -6,6 +6,10 @@
 -mt
 hbmk2.prg
 
+-l{shared}hbcplr
+-l{shared}hbpp
+-l{shared}hbcommon
+
 hbmk2.${lng}.po
--hbl=hbmk2.${lng}.hbl
+-hbi=hbmk2.${lng}.hbi
 -lng=hu_HU,pt_BR
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index d078e5c94b..04fe117d79 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -5724,9 +5724,10 @@ FUNCTION hbmk_CPU( hbmk )
 
 FUNCTION hbmk_KEYW( hbmk, cKeyword )
 
-   IF cKeyword == iif( hbmk[ _HBMK_lMT ]   , "mt"   , "st"      ) .OR. ;
-      cKeyword == iif( hbmk[ _HBMK_lGUI ]  , "gui"  , "std"     ) .OR. ;
-      cKeyword == iif( hbmk[ _HBMK_lDEBUG ], "debug", "nodebug" )
+   IF cKeyword == iif( hbmk[ _HBMK_lMT ]    , "mt"    , "st"      ) .OR. ;
+      cKeyword == iif( hbmk[ _HBMK_lGUI ]   , "gui"   , "std"     ) .OR. ;
+      cKeyword == iif( hbmk[ _HBMK_lDEBUG ] , "debug" , "nodebug" ) .OR. ;
+      cKeyword == iif( hbmk[ _HBMK_lSHARED ], "shared", "static"  )
       RETURN .T.
    ENDIF
 
diff --git a/harbour/utils/hbrun/hbrun.hbm b/harbour/utils/hbrun/hbrun.hbm
index 32a14c24d9..8da76b76bc 100644
--- a/harbour/utils/hbrun/hbrun.hbm
+++ b/harbour/utils/hbrun/hbrun.hbm
@@ -3,3 +3,7 @@
 #
 
 hbrun.prg
+
+-l{shared}hbcplr
+-l{shared}hbpp
+-l{shared}hbcommon