diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d671328b49..486e808c5e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-07 17:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+    + Won't falsely autodetect cygwin if cygstart.exe doesn't
+      have a gcc.exe next to it. (sync with recently added hbmk2 logic)
+
 2010-05-07 17:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * package/winuni/RELNOTES
     * Updated according to local tool changes.
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 900ed7c6c0..9c040c1954 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -693,6 +693,12 @@ ifeq ($(HB_COMPILER),)
                   HB_CCPREFIX := i386-mingw32ce-
                else
                   HB_COMP_PATH := $(call find_in_path,cygstart)
+                  ifneq ($(HB_COMP_PATH),)
+                     # Check for a gcc executable in the same directory
+                     ifeq ($(wildcard $(dir $(HB_COMP_PATH))gcc$(HB_HOST_BIN_EXT)),)
+                        HB_COMP_PATH :=
+                     endif
+                  endif
                   ifneq ($(HB_COMP_PATH),)
                      HB_COMPILER := cygwin
                   else