diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e45712f969..414e83eead 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-15 15:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * make_gnu_xmingwce.sh
+  * make_gnu_xmingw.sh
+    * Rename: HB_HOST_CC -> HB_HOST_COMP
+
 2009-07-15 14:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * source/pp/Makefile
     - Removed HB_PPGEN_PATH setting. Now HB_BIN_COMPILE is used to
diff --git a/harbour/make_gnu_xmingw.sh b/harbour/make_gnu_xmingw.sh
index e2b7f36585..0f9f1b1918 100755
--- a/harbour/make_gnu_xmingw.sh
+++ b/harbour/make_gnu_xmingw.sh
@@ -22,12 +22,12 @@ export HB_COMPILER=mingw
 
 if [ "$OSTYPE" = "msdosdjgpp" ]; then
     HB_HOST_ARCH="dos"
-    HB_HOST_CC="djgpp"
+    HB_HOST_COMP="djgpp"
 else
     HB_HOST_ARCH="${UNAMEL}"
-    HB_HOST_CC="gcc"
+    HB_HOST_COMP="gcc"
     case "$HB_HOST_ARCH" in
-        *windows*|*mingw32*|msys*)  HB_HOST_ARCH="win"; HB_HOST_CC="mingw" ;;
+        *windows*|*mingw32*|msys*)  HB_HOST_ARCH="win"; HB_HOST_COMP="mingw" ;;
         *dos)    HB_HOST_ARCH="dos" ;;
         *bsd)    HB_HOST_ARCH="bsd" ;;
     esac
@@ -121,7 +121,7 @@ if [ -z "${HB_COMP_PATH}" ]; then
     if which harbour > /dev/null 2>&1; then
         HB_COMP_PATH=`which harbour 2> /dev/null`
     else
-        HB_COMP_PATH="$DIR/source/main/$HB_HOST_ARCH/$HB_HOST_CC/harbour"
+        HB_COMP_PATH="$DIR/source/main/$HB_HOST_ARCH/$HB_HOST_COMP/harbour"
     fi
 fi
 
@@ -135,14 +135,14 @@ fi
 if [ -z "${HB_PPGEN_PATH}" ]; then
     if which hbpp &> /dev/null; then
         HB_PPGEN_PATH=`which hbpp 2> /dev/null`
-    elif [ -x "${DIR}/source/pp/${HB_HOST_ARCH}/${HB_HOST_CC}/hbpp" ]; then
-        HB_PPGEN_PATH="${DIR}/source/pp/${HB_HOST_ARCH}/${HB_HOST_CC}/hbpp"
+    elif [ -x "${DIR}/source/pp/${HB_HOST_ARCH}/${HB_HOST_COMP}/hbpp" ]; then
+        HB_PPGEN_PATH="${DIR}/source/pp/${HB_HOST_ARCH}/${HB_HOST_COMP}/hbpp"
     else
         DIR=`dirname ${HB_COMP_PATH}`
         if [ -x "${DIR}/hbpp" ]; then
             HB_PPGEN_PATH="${DIR}/hbpp"
         else
-            HB_PPGEN_PATH="$DIR/source/pp/$HB_HOST_ARCH/$HB_HOST_CC/hbpp"
+            HB_PPGEN_PATH="$DIR/source/pp/$HB_HOST_ARCH/$HB_HOST_COMP/hbpp"
         fi
     fi
 fi
diff --git a/harbour/make_gnu_xmingwce.sh b/harbour/make_gnu_xmingwce.sh
index 8a8232476d..730024edf7 100755
--- a/harbour/make_gnu_xmingwce.sh
+++ b/harbour/make_gnu_xmingwce.sh
@@ -22,12 +22,12 @@ export HB_COMPILER=mingwarm
 
 if [ "$OSTYPE" = "msdosdjgpp" ]; then
     HB_HOST_ARCH="dos"
-    HB_HOST_CC="djgpp"
+    HB_HOST_COMP="djgpp"
 else
     HB_HOST_ARCH="${UNAMEL}"
-    HB_HOST_CC="gcc"
+    HB_HOST_COMP="gcc"
     case "$HB_HOST_ARCH" in
-        *windows*|*mingw32*|msys*)  HB_HOST_ARCH="win"; HB_HOST_CC="mingw" ;;
+        *windows*|*mingw32*|msys*)  HB_HOST_ARCH="win"; HB_HOST_COMP="mingw" ;;
         *dos)    HB_HOST_ARCH="dos" ;;
         *bsd)    HB_HOST_ARCH="bsd" ;;
     esac
@@ -86,7 +86,7 @@ if [ -z "${HB_COMP_PATH}" ]; then
     if which harbour > /dev/null 2>&1; then
         HB_COMP_PATH=`which harbour 2> /dev/null`
     else
-        HB_COMP_PATH="$DIR/source/main/$HB_HOST_ARCH/$HB_HOST_CC/harbour"
+        HB_COMP_PATH="$DIR/source/main/$HB_HOST_ARCH/$HB_HOST_COMP/harbour"
     fi
 fi
 
@@ -100,14 +100,14 @@ fi
 if [ -z "${HB_PPGEN_PATH}" ]; then
     if which hbpp &> /dev/null; then
         HB_PPGEN_PATH=`which hbpp 2> /dev/null`
-    elif [ -x "${DIR}/source/pp/${HB_HOST_ARCH}/${HB_HOST_CC}/hbpp" ]; then
-        HB_PPGEN_PATH="${DIR}/source/pp/${HB_HOST_ARCH}/${HB_HOST_CC}/hbpp"
+    elif [ -x "${DIR}/source/pp/${HB_HOST_ARCH}/${HB_HOST_COMP}/hbpp" ]; then
+        HB_PPGEN_PATH="${DIR}/source/pp/${HB_HOST_ARCH}/${HB_HOST_COMP}/hbpp"
     else
         DIR=`dirname ${HB_COMP_PATH}`
         if [ -x "${DIR}/hbpp" ]; then
             HB_PPGEN_PATH="${DIR}/hbpp"
         else
-            HB_PPGEN_PATH="$DIR/source/pp/$HB_HOST_ARCH/$HB_HOST_CC/hbpp"
+            HB_PPGEN_PATH="$DIR/source/pp/$HB_HOST_ARCH/$HB_HOST_COMP/hbpp"
         fi
     fi
 fi