diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9f8c7d035e..b5e64aa647 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-06-02 20:11 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/compiler/ppcomp.c
+  * harbour/source/compiler/cmdcheck.c
+    ! do not disable macrotext substitution for -kc
+
 2008-06-02 19:55 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbexprop.h
   * harbour/include/hbexprb.c
diff --git a/harbour/source/compiler/cmdcheck.c b/harbour/source/compiler/cmdcheck.c
index d474418a56..06cce35957 100644
--- a/harbour/source/compiler/cmdcheck.c
+++ b/harbour/source/compiler/cmdcheck.c
@@ -373,7 +373,8 @@ static void hb_compChkEnvironVar( HB_COMP_DECL, char *szSwitch )
                      case 'c':
                         /* clear all flags - minimal set of features */
                         HB_COMP_PARAM->supported &= HB_COMPFLAG_SHORTCUTS;
-                        HB_COMP_PARAM->supported |= HB_COMPFLAG_OPTJUMP;
+                        HB_COMP_PARAM->supported |= HB_COMPFLAG_OPTJUMP |
+                                                    HB_COMPFLAG_MACROTEXT;
                         break;
 
                      case 'x':
diff --git a/harbour/source/compiler/ppcomp.c b/harbour/source/compiler/ppcomp.c
index 2c88c553a0..9537bc8a23 100644
--- a/harbour/source/compiler/ppcomp.c
+++ b/harbour/source/compiler/ppcomp.c
@@ -195,7 +195,8 @@ static BOOL hb_pp_CompilerSwitch( void * cargo, const char * szSwitch,
             case 'c':
                /* clear all flags - minimal set of features */
                HB_COMP_PARAM->supported &= HB_COMPFLAG_SHORTCUTS;
-               HB_COMP_PARAM->supported |= HB_COMPFLAG_OPTJUMP;
+               HB_COMP_PARAM->supported |= HB_COMPFLAG_OPTJUMP |
+                                           HB_COMPFLAG_MACROTEXT;
                break;
             case 'h':
                iFlag = HB_COMPFLAG_HARBOUR;