diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 41d02574d8..c5b99c12f0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-28 18:12 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/utils/hbmk2/Makefile
+    ! fixed list of linked libraries - hbpp and hbcommon libs were
+      given explicitly though they are also included in harbour
+      shared library. It means that for HB_BUILD_SHARED=yes some semi
+      dynamic hbmk2 executable was created with repeated compiled hbpp and
+      hbcommon code. The first copy was inside hbmk2 executable file and
+      the second one inside harbour shared library (.so, .dyn, .dll, ...).
+      This fix should also resolves the problem with missing math library
+      when hbmk2 was linked.
+
 2011-02-28 17:09 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbxbp/xbplistbox.prg
   * contrib/hbxbp/xbptabpage.prg
diff --git a/harbour/utils/hbmk2/Makefile b/harbour/utils/hbmk2/Makefile
index 192a57e860..3c1efe26a5 100644
--- a/harbour/utils/hbmk2/Makefile
+++ b/harbour/utils/hbmk2/Makefile
@@ -11,7 +11,7 @@ PRG_SOURCES := \
 
 PRG_MAIN := hbmk2.prg
 
-LIBS = hbcplr hbpp hbcommon $(HB_LIBS_MT_NORDD)
+LIBS = $(HB_LIBS_MT_NORDD)
 
 ifneq ($(HB_HAS_GPM),)
    HB_PRGFLAGS += -DHB_HAS_GPM