diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cb330a8c1a..6405e08e3a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-05 04:33 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed to pass self-inherited -mlp64, -mlp32, -m64, -m32
+      C compiler flags also to executable and dynlib linker.
+
 2009-12-05 04:28 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/pp/hbpp.c
   * src/compiler/hbusage.c
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index ee30c1aaad..dbd40e2a37 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2342,13 +2342,14 @@ FUNCTION hbmk( aArgs, /* @ */ lPause )
          ENDIF
 
          /* Always inherit/reproduce some flags from self */
-
-         tmp := hb_Version( HB_VERSION_FLAG_C )
-         IF     "-mlp64" $ tmp ; AAddNew( hbmk[ _HBMK_aOPTC ], "-mlp64" )
-         ELSEIF "-mlp32" $ tmp ; AAddNew( hbmk[ _HBMK_aOPTC ], "-mlp32" )
-         ELSEIF "-m64"   $ tmp ; AAddNew( hbmk[ _HBMK_aOPTC ], "-m64" )
-         ELSEIF "-m32"   $ tmp ; AAddNew( hbmk[ _HBMK_aOPTC ], "-m32" )
-         ENDIF
+         FOR EACH tmp IN { "-mlp64", "-mlp32", "-m64", "-m32" }
+            IF tmp $ hb_Version( HB_VERSION_FLAG_C )
+               AAddNew( hbmk[ _HBMK_aOPTC ], tmp )
+               AAddNew( hbmk[ _HBMK_aOPTL ], tmp )
+               AAddNew( hbmk[ _HBMK_aOPTD ], tmp )
+               EXIT
+            ENDIF
+         NEXT
 
          /* Add system libraries */
          IF ! hbmk[ _HBMK_lSHARED ]