diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7eb2891b44..4879047745 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,19 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-08-25 19:49 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * include/hbsetup.h
+     ! Fixed problem where Darwin autodetection went wrong 
+       between 1.0.0rc2 -> 1.0.0.
+     * HB_OS_DARWIN added to the HB_OS_UNIX detection list.
+       (no functional difference, just makes it more clear.)
+     % HB_OS_OS2_EMX removed. It was unused.
+
+   * source/compiler/gencobj.c
+   * include/hbsetup.h
+     % Removed OS_DOS_COMPATIBLE.
+       It's equivalent to !defined(HB_OS_UNIX_COMPATIBLE).
+
 2008-08-25 18:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * source/common/hbver.c
      ! Fix to commit '2008-07-11 18:20 UTC+0200' which 
diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h
index fd2f72d2d3..60b1c30791 100644
--- a/harbour/include/hbsetup.h
+++ b/harbour/include/hbsetup.h
@@ -212,7 +212,6 @@
    #define HB_OS_EOL_LEN                1
 #else
    /* we are assuming here the DOS compatible OS */
-   #define OS_DOS_COMPATIBLE
    #define HB_OS_PATH_LIST_SEP_CHR      ';'
    #define HB_OS_PATH_DELIM_CHR         '\\'
    #define HB_OS_PATH_DELIM_CHR_STRING  "\\"
@@ -268,19 +267,12 @@
    #endif
 #endif
 
-/* ***********************************************************************
- *  Detect GCC/OS2
- */
 #if defined(__EMX__) && ! defined(__RSXNT__)
    #define HB_OS_OS2_GCC
 #endif
-
 #ifndef HB_OS_OS2
    #if defined(OS2) || defined(__OS2__) || defined(OS_2) || defined(HB_OS_OS2_GCC)
       #define HB_OS_OS2
-      #if defined(__EMX__)
-         #define HB_OS_OS2_EMX
-      #endif
    #endif
 #endif
 
@@ -320,9 +312,14 @@
    #endif
 #endif
 
+#ifndef HB_OS_MAC
+   #if defined(__MPW__)
+      #define HB_OS_MAC
+   #endif
+#endif
+
 #ifndef HB_OS_DARWIN
-   #if defined(__APPLE__) && \
-       ( defined(unix) || defined(__unix) || defined(__unix__) )
+   #if defined(__APPLE__)
       #define HB_OS_DARWIN
    #endif
 #endif
@@ -335,18 +332,16 @@
 #endif
 
 #ifndef HB_OS_UNIX
-   #if defined(HB_OS_UNIX_COMPATIBLE) || defined(HB_OS_LINUX) || \
-       defined(HB_OS_BSD) || defined(HB_OS_SUNOS) || defined(HB_OS_HPUX)
+   #if defined(HB_OS_UNIX_COMPATIBLE) || \
+       defined(HB_OS_LINUX) || \
+       defined(HB_OS_DARWIN) || \
+       defined(HB_OS_BSD) || \
+       defined(HB_OS_SUNOS) || \
+       defined(HB_OS_HPUX)
       #define HB_OS_UNIX
    #endif
 #endif
 
-#ifndef HB_OS_MAC
-   #if defined(__MPW__)
-      #define HB_OS_MAC
-   #endif
-#endif
-
 /* ***********************************************************************
  * Here you can force the EOL string to be CRLF
  *
diff --git a/harbour/source/compiler/gencobj.c b/harbour/source/compiler/gencobj.c
index 4f6b01f795..e99f4bc7a3 100644
--- a/harbour/source/compiler/gencobj.c
+++ b/harbour/source/compiler/gencobj.c
@@ -36,8 +36,8 @@
 
 #if defined( HB_OS_UNIX_COMPATIBLE )
    #define HB_NULL_STR " > /dev/null"
-#elif defined( OS_DOS_COMPATIBLE )
-   #define HB_NULL_STR " >nul"      
+#else
+   #define HB_NULL_STR " >nul"
 #endif
 
 /*--------------------------------------------------------------------------*/
@@ -135,10 +135,8 @@ void hb_compGenCObj( HB_COMP_DECL, PHB_FNAME pFileName )
    char buffer[ HB_CFG_LINE_LEN * 2 + 1024 ];
 #if defined( HB_OS_UNIX_COMPATIBLE )
    char * pszEnv = hb_strdup( "/etc:/usr/local/etc" );
-#elif defined( OS_DOS_COMPATIBLE )
-   char * pszEnv = hb_getenv( "PATH" );
 #else
-   char * pszEnv = NULL;
+   char * pszEnv = hb_getenv( "PATH" );
 #endif
    char * pszCfgFileName = hb_getenv( "HB_CFG_FILE" );
    FILE * filecfg;