diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 44f05d18d6..e42ee38d9a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-11-09 17:44 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * make_vc.mak
+  * config/rules.cf
+  * config/w32/mingwce.cf
+  * config/w32/poccce.cf
+  * config/w32/msvcce.cf
+    * Use Harbour option -gc0 for WinCE builds.
+    * Use C option -O2 (instead of -O3) for MinGWCE builds.
+    ; None of these were tested.
+
 2008-11-09 17:15 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * source/vm/arrays.c
   * source/vm/classes.c
diff --git a/harbour/config/rules.cf b/harbour/config/rules.cf
index 729b8e3692..09f3d06cb3 100644
--- a/harbour/config/rules.cf
+++ b/harbour/config/rules.cf
@@ -20,7 +20,7 @@ HB := $(HB_BIN_COMPILE)/
 endif
 HB := $(HB)harbour$(EXE_EXT)
 
-HB_FLAGS = -n -i$(HB_INC_COMPILE) -q0 -w3 -es2 -gc3 -km -l
+HB_FLAGS = -n -i$(HB_INC_COMPILE) -q0 -w3 -es2 -gc3 -km -l $(HB_FLAGS)
 
 # The rule to link an executable.
 ifeq ($(LD_RULE),)
diff --git a/harbour/config/w32/mingwce.cf b/harbour/config/w32/mingwce.cf
index 3b5777becc..437f38e6c5 100644
--- a/harbour/config/w32/mingwce.cf
+++ b/harbour/config/w32/mingwce.cf
@@ -9,11 +9,15 @@ EXE_EXT = .exe
 LIB_PREF = lib
 LIB_EXT = .a
 
+rem Favor size for CE builds.
+HB_FLAGS = -gc0
+
 CC = $(CCPREFIX)gcc
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
-CFLAGS = -Wall -W -O3
+rem Use -O2 instead of -O3 here.
+CFLAGS = -Wall -W -O2
 
 LD = $(CCPREFIX)gcc
 LD_OUT = -o
diff --git a/harbour/config/w32/msvcce.cf b/harbour/config/w32/msvcce.cf
index 617edef9f6..40a3fcfbb1 100644
--- a/harbour/config/w32/msvcce.cf
+++ b/harbour/config/w32/msvcce.cf
@@ -11,6 +11,9 @@ EXE_EXT = .exe
 LIB_PREF =
 LIB_EXT = .lib
 
+rem Favor size for CE builds.
+HB_FLAGS = -gc0
+
 CC = cl.exe
 CC_IN = -c
 CC_OUT = -Fo
diff --git a/harbour/config/w32/poccce.cf b/harbour/config/w32/poccce.cf
index b86862776c..ad21b1c64c 100644
--- a/harbour/config/w32/poccce.cf
+++ b/harbour/config/w32/poccce.cf
@@ -12,6 +12,9 @@ EXE_EXT = .exe
 LIB_PREF =
 LIB_EXT = .lib
 
+rem Favor size for CE builds.
+HB_FLAGS = -gc0
+
 CC = pocc.exe
 CC_IN = -c
 CC_OUT = -Fo
diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak
index 0dd953622e..08b0d35b70 100644
--- a/harbour/make_vc.mak
+++ b/harbour/make_vc.mak
@@ -91,6 +91,11 @@ DLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\dll\vc)
 
 VMMT_LIB_OBJS = $(VM_LIB_OBJS:obj\vc=obj\vc_mt)
 
+!if "$(HB_BUILD_WINCE)" == "yes"
+HARBOURFLAGS    = $(HARBOURFLAGS) -gc0
+HARBOURFLAGSDLL = $(HARBOURFLAGSDLL) -gc0
+!endif
+
 #**********************************************************
 # C compiler, Harbour compiler and Linker flags.
 #**********************************************************