diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4628361842..861e032a4f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-24 14:29 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbsetup.h
+    * minor extension to CPU detection macros
+
 2009-11-24 13:20 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/rtl/cdpapi.c
     ! fixed bad typo in hb_cdpTranslateChar() function
diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h
index 05ade47d34..79a40bef11 100644
--- a/harbour/include/hbsetup.h
+++ b/harbour/include/hbsetup.h
@@ -348,6 +348,7 @@
 
 #elif defined( __amd64__ ) || \
       defined( __amd64 ) || \
+      defined( __AMD64__ ) || \
       defined( __x86_64__ ) || \
       defined( __x86_64 ) || \
       defined( _M_AMD64 ) || \
@@ -369,7 +370,10 @@
 #elif defined( i386 ) || \
       defined( __i386__ ) || \
       defined( __i386 ) || \
+      defined( __386__ ) || \
       defined( _M_IX86 ) || \
+      defined( _M_I86 ) || \
+      defined( M_I86 ) || \
       defined( __X86__ ) || \
       defined( _X86_ ) || \
       defined( __I86__ ) || \