diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 445c8d282a..61a9af085b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,10 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-16 11:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+    + Added HB_COMPILER autodetection for QNX. Minor optimization.
+
 2010-06-16 11:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbcurl/hbcurl.c
     + Added all remaining known guards to HB_CURLOPT_* options, so in
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 0c6c3aea14..cb219f7463 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -971,7 +971,7 @@ ifeq ($(HB_COMPILER),)
             endif
          endif
       else
-      ifneq ($(filter $(HB_PLATFORM),hpux bsd),)
+      ifneq ($(filter $(HB_PLATFORM),hpux bsd beos qnx),)
          HB_COMP_PATH := $(call find_in_path,gcc)
          ifneq ($(HB_COMP_PATH),)
             HB_COMPILER := gcc
@@ -1026,13 +1026,6 @@ ifeq ($(HB_COMPILER),)
                HB_COMPILER := watcom
             endif
          endif
-      else
-      ifeq ($(HB_PLATFORM),beos)
-         HB_COMP_PATH := $(call find_in_path,gcc)
-         ifneq ($(HB_COMP_PATH),)
-            HB_COMPILER := gcc
-         endif
-      endif
       endif
       endif
       endif