diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3a8485e03e..0e422a8f19 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-17 10:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbsetup.h
+    ! Added __BEOS__ check when detecting HB_OS_BEOS.
+
 2009-09-17 10:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * source/rdd/usrrdd/rdds/arrayrdd.prg
   * contrib/hbct/tests/datetime.prg
diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h
index 0fa1b8d0ad..35b45622d7 100644
--- a/harbour/include/hbsetup.h
+++ b/harbour/include/hbsetup.h
@@ -280,7 +280,7 @@
 #endif
 
 #ifndef HB_OS_BEOS
-   #if defined( __HAIKU__ )
+   #if defined( __HAIKU__ ) || defined( __BEOS__ )
       #define HB_OS_BEOS
    #endif
 #endif