diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 94f6585553..86dc024431 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,31 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-10 15:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * tests/hbpptest/Makefile
+  * tests/Makefile
+  * utils/hbformat/Makefile
+  * utils/hbtest/Makefile
+    * Trying to lessen the number of combinations + sync core lib
+      lists in Makefiles.
+      These are currently used combinations in Harbour:
+      ---
+                                             hbextern
+      hbdebug      hbdebug      hbdebug      hbdebug      hbdebug
+      hbvm         hbvm         hbvm         hbvm         hbvmmt
+      hbrtl        hbrtl        hbrtl        hbrtl        hbrtl
+      hblang       hblang       hblang       hblang       hblang
+      hbcpage      hbcpage      hbcpage      hbcpage      hbcpage
+      hbrdd        hbrdd        hbnulrdd     hbrdd        hbnulrdd
+      hbrtl        hbrtl        hbrtl        hbrtl        hbrtl
+      hbvm         hbvm         hbvm         hbvm         hbvmmt
+      hbmacro      hbmacro      hbmacro      hbmacro      hbmacro
+                                             hbcplr       hbcplr
+      hbpp         hbpp                      hbpp         hbpp
+      hbcommon     hbcommon     hbcommon     hbcommon     hbcommon
+                   hbpcre
+      ---
+
 2009-08-10 15:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * external/sqlite3/Makefile
   * external/libhpdf/Makefile
diff --git a/harbour/tests/Makefile b/harbour/tests/Makefile
index 3b10d7fffb..8bb19f94d8 100644
--- a/harbour/tests/Makefile
+++ b/harbour/tests/Makefile
@@ -13,6 +13,7 @@ LIBS := \
    hbvm \
    hbrtl \
    hblang \
+   hbcpage \
    hbrdd \
    hbrtl \
    hbvm \
diff --git a/harbour/tests/hbpptest/Makefile b/harbour/tests/hbpptest/Makefile
index 99ee9e106e..11dbd7f224 100644
--- a/harbour/tests/hbpptest/Makefile
+++ b/harbour/tests/hbpptest/Makefile
@@ -18,6 +18,7 @@ LIBS := \
    hbvm \
    hbrtl \
    hblang \
+   hbcpage \
    hbrdd \
    hbrtl \
    hbvm \
diff --git a/harbour/utils/hbformat/Makefile b/harbour/utils/hbformat/Makefile
index 6f28a3ad71..7723659eb8 100644
--- a/harbour/utils/hbformat/Makefile
+++ b/harbour/utils/hbformat/Makefile
@@ -27,7 +27,5 @@ LIBS := \
    hbvm \
    hbmacro \
    hbcommon \
-   hbpp \
-   hbcplr \
 
 include $(TOP)$(ROOT)config/bin.cf
diff --git a/harbour/utils/hbtest/Makefile b/harbour/utils/hbtest/Makefile
index 0552875b4c..54ae39c366 100644
--- a/harbour/utils/hbtest/Makefile
+++ b/harbour/utils/hbtest/Makefile
@@ -33,6 +33,7 @@ LIBS := \
    hbvm \
    hbrtl \
    hblang \
+   hbcpage \
    hbrdd \
    hbrtl \
    hbvm \
@@ -43,3 +44,4 @@ LIBS := \
 HB_USER_PRGFLAGS += -l-
 
 include $(TOP)$(ROOT)config/bin.cf
+