diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a1b131800f..9e5d3ffde1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-07 15:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.cf
+    + Added HB_COMPILER autodetection for darwin/hpux/bsd.
+
 2009-08-07 11:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbtip/Makefile
   - contrib/hbtip/popcln.prg
@@ -32,11 +36,12 @@
 
 2009-08-07 11:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * source/rtl/filesys.c
-    ! Fixed FO_EXCL flag on win/wce platforms. It was ignored before.
+    ! HB_FCREATE(): fixed FO_EXCL flag on win/wce platforms.
+      It was ignored before.
     % Deleted some unnecessary casts.
 
   * contrib/hbtip/log.prg
-    ! Fixed to avoid infinite loops when trying to create log files
+    ! Fixed to avoid infinite loops when trying to create log file
       on a non-existing path.
 
 2009-08-07 11:11 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
diff --git a/harbour/config/global.cf b/harbour/config/global.cf
index ed571aee41..0b5977a2d2 100644
--- a/harbour/config/global.cf
+++ b/harbour/config/global.cf
@@ -111,9 +111,8 @@ ifeq ($(HB_CONFIG_SHOWN),)
       #   HB_HOST_BUILD, HB_XBUILD, HB_WITHOUT_*, HB_REBUILD_PARSER
 
       ifeq ($(HB_DYNLIB),yes)
-         $(info Harbour GNU Make: Dynamic library creation phase)
+         $(info Dynamic library creation phase)
       endif
-      $(info Harbour GNU Make: Configuration:)
       ifneq ($(HB_USER_PRGFLAGS),)
          $(info HB_USER_PRGFLAGS: $(HB_USER_PRGFLAGS))
       endif
@@ -359,34 +358,40 @@ ifeq ($(HB_COMPILER),)
             endif
          endif
       else
-         ifeq ($(HB_ARCHITECTURE),sunos)
-            ifneq ($(call find_in_path,cc),)
-               HB_COMPILER := sunpro
-            else
-               ifneq ($(call find_in_path,gcc),)
-                  HB_COMPILER := gcc
-               endif
+         ifneq ($(findstring $(HB_ARCHITECTURE),darwin hpux bsd),)
+            ifneq ($(call find_in_path,gcc),)
+               HB_COMPILER := gcc
             endif
          else
-            ifeq ($(HB_ARCHITECTURE),dos)
-               ifneq ($(call find_in_path,gcc),)
-                  HB_COMPILER := djgpp
+            ifeq ($(HB_ARCHITECTURE),sunos)
+               ifneq ($(call find_in_path,cc),)
+                  HB_COMPILER := sunpro
                else
-                  ifneq ($(call find_in_path,wpp386),)
-                     HB_COMPILER := watcom
+                  ifneq ($(call find_in_path,gcc),)
+                     HB_COMPILER := gcc
                   endif
                endif
             else
-               ifeq ($(HB_ARCHITECTURE),os2)
+               ifeq ($(HB_ARCHITECTURE),dos)
                   ifneq ($(call find_in_path,gcc),)
-                     HB_COMPILER := gcc
+                     HB_COMPILER := djgpp
                   else
                      ifneq ($(call find_in_path,wpp386),)
                         HB_COMPILER := watcom
                      endif
                   endif
                else
-                  # add other platforms here
+                  ifeq ($(HB_ARCHITECTURE),os2)
+                     ifneq ($(call find_in_path,gcc),)
+                        HB_COMPILER := gcc
+                     else
+                        ifneq ($(call find_in_path,wpp386),)
+                           HB_COMPILER := watcom
+                        endif
+                     endif
+                  else
+                     # add other platforms here
+                  endif
                endif
             endif
          endif