diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9a3c52032f..c7a74afbc6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-16 03:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * ChangeLog
+  * source/rtl/Makefile
+  * source/rdd/Makefile
+  * config/bin.cf
+  * config/wce/global.cf
+  * config/rules.cf
+    % Using HB_PRGFLAGS instead of HB_GCMODE. Logic is now simple
+      and standard.
+
 2009-08-16 02:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.cf
   * config/rules.cf
@@ -129,7 +139,8 @@
       Makefile level manipulation of flags. Should eventually
       replace all HB_USER_*FLAGS, HB_GCMODE, HB_INC_DEPEND,
       HB_CUNICODE, HB_CDBG and HB_FLAGSEXTRA variables, if everything
-      goes well.
+      goes well. [DONE - except for HB_INC_DEPEND because it
+      cannot be put to the right place inside cmdline with HB_*FLAGS]
 
   * contrib/hbwin/wapi_winuser.c
     + Added WAPI_GETKEYSTATE().
diff --git a/harbour/config/bin.cf b/harbour/config/bin.cf
index 97aae6276c..dd529987c9 100644
--- a/harbour/config/bin.cf
+++ b/harbour/config/bin.cf
@@ -56,8 +56,6 @@ include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/$(HB_COMPILER).cf
 include $(TOP)$(ROOT)config/c.cf
 include $(TOP)$(ROOT)config/prg.cf
 
-HB_GCMODE := 0
-
 BIN_NAME :=
 
 ifneq ($(C_MAIN),)
diff --git a/harbour/config/rules.cf b/harbour/config/rules.cf
index 76066b0e70..ed8b7470b4 100644
--- a/harbour/config/rules.cf
+++ b/harbour/config/rules.cf
@@ -22,10 +22,7 @@ endif
 
 # How to run Harbour
 HB := $(HB_HOST_BIN_DIR)/harbour$(HB_HOST_BIN_EXT)
-ifeq ($(HB_GCMODE),)
-   HB_GCMODE := 0
-endif
-HB_FLAGS := -n1 $(HB_INC_DEPEND) -i$(HB_INC_COMPILE) -q0 -w3 -es2 -kmo -gc$(HB_GCMODE) $(HB_PRGFLAGS)
+HB_FLAGS := -n1 $(HB_INC_DEPEND) -i$(HB_INC_COMPILE) -q0 -w3 -es2 -kmo $(HB_PRGFLAGS)
 HB_RULE = $(HB) $? $(HB_FLAGS) $(HB_USER_PRGFLAGS)
 
 # Use default rules if architecture/compiler specific rule is not defined
diff --git a/harbour/config/wce/global.cf b/harbour/config/wce/global.cf
index d98d219096..919e88da2b 100644
--- a/harbour/config/wce/global.cf
+++ b/harbour/config/wce/global.cf
@@ -10,7 +10,4 @@ HB_GT_LIBS += gtwvt gtgui
 
 SYSLIBS := ws2
 
-# Favor size for CE builds.
-HB_GCMODE := 0
-
 HB_BUILD_UNICODE := yes
diff --git a/harbour/source/rdd/Makefile b/harbour/source/rdd/Makefile
index 661630e3d5..d6b8893885 100644
--- a/harbour/source/rdd/Makefile
+++ b/harbour/source/rdd/Makefile
@@ -7,7 +7,7 @@ ROOT := ../../
 include $(TOP)$(ROOT)config/global.cf
 
 ifneq ($(HB_ARCHITECTURE),wce)
-   HB_GCMODE := 3
+   HB_PRGFLAGS := -gc3
 endif
 
 C_SOURCES := \
diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile
index bea70d1073..7464539193 100644
--- a/harbour/source/rtl/Makefile
+++ b/harbour/source/rtl/Makefile
@@ -7,7 +7,7 @@ ROOT := ../../
 include $(TOP)$(ROOT)config/global.cf
 
 ifneq ($(HB_ARCHITECTURE),wce)
-   HB_GCMODE := 3
+   HB_PRGFLAGS := -gc3
 endif
 
 C_SOURCES := \