diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3fd2f22440..c7fe331ba0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-02 09:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/none.cf
+  * config/win/global.cf
+  * config/wce/global.cf
+    ! Attempt to fix problem where 'COMSPEC' envvar wasn't picked
+      by GNU Make on default XP installation, where this envvar
+      is defined as 'ComSpec', and mingw GNU Make is case-sensitive
+      for envvar names. This patch is needed to make Harbour build
+      with clean PATH (without OS).
+      Thanks to April White for discovering this.
+
 2009-07-02 09:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/generator/hbqtgen.prg
   * contrib/hbqt/Makefile_gen
diff --git a/harbour/config/none.cf b/harbour/config/none.cf
index 193a03fc64..018dfab8a5 100644
--- a/harbour/config/none.cf
+++ b/harbour/config/none.cf
@@ -5,11 +5,15 @@
 ifneq ($(HB_ARCHITECTURE),)
 ifneq ($(HB_COMPILER),)
 
+ifneq ($(ComSpec),)
+   COMSPEC := $(ComSpec)
+endif
+
 CMDPREF:=
 ifeq ($(SHLVL),)
-ifneq ($(COMSPEC),)
-CMDPREF:=$(COMSPEC) /C
-endif
+   ifneq ($(COMSPEC),)
+      CMDPREF := $(COMSPEC) /C
+   endif
 endif
 
 ifneq ($(LIBNAME),)
diff --git a/harbour/config/wce/global.cf b/harbour/config/wce/global.cf
index 528e4f4f03..3c5e455861 100644
--- a/harbour/config/wce/global.cf
+++ b/harbour/config/wce/global.cf
@@ -40,18 +40,22 @@ DIRSEP = $(subst /,\,\)
 
 MK := $(subst \,/,$(subst \~,~,$(MAKE)))
 
+ifneq ($(ComSpec),)
+   COMSPEC := $(ComSpec)
+endif
+
 ifeq ($(COMSPEC),) #location of command.com
-	ifeq ($(OS),Windows_NT)
-		COMSPEC := cmd.exe
-	else
-		COMSPEC := command.com
-	endif
+   ifeq ($(OS),Windows_NT)
+      COMSPEC := cmd.exe
+   else
+      COMSPEC := command.com
+   endif
 endif
 
 ifeq ($(findstring cmd.exe,$(COMSPEC)),cmd.exe)
-  CMD_EXE := yes
+   CMD_EXE := yes
 else
-  CMD_EXE := no
+   CMD_EXE := no
 endif
 
 RM = del
diff --git a/harbour/config/win/global.cf b/harbour/config/win/global.cf
index 980f6880e7..1b0e72d422 100644
--- a/harbour/config/win/global.cf
+++ b/harbour/config/win/global.cf
@@ -36,18 +36,22 @@ DIRSEP = $(subst /,\,\)
 
 MK := $(subst \,/,$(subst \~,~,$(MAKE)))
 
+ifneq ($(ComSpec),)
+   COMSPEC := $(ComSpec)
+endif
+
 ifeq ($(COMSPEC),) #location of command.com
-	ifeq ($(OS),Windows_NT)
-		COMSPEC := cmd.exe
-	else
-		COMSPEC := command.com
-	endif
+   ifeq ($(OS),Windows_NT)
+      COMSPEC := cmd.exe
+   else
+      COMSPEC := command.com
+   endif
 endif
 
 ifeq ($(findstring cmd.exe,$(COMSPEC)),cmd.exe)
-  CMD_EXE := yes
+   CMD_EXE := yes
 else
-  CMD_EXE := no
+   CMD_EXE := no
 endif
 
 RM = del