diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 0e7eb36489..83c26fd267 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-12 11:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+    + Added several CPUs to CPU autodetection.
+    ; Please test it on actual systems.
+
 2009-09-12 11:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.mk
     + Added logic for host CPU detection on *nix systems.
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index fac9800401..38b4abfa82 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -114,10 +114,32 @@ endef
 
 define check_host_cpu
 
-   # TODO: Please extend
+   # TODO: Please fix/extend
 
-   ifneq ($(findstring 86,$(1)),)
+   ifneq ($(findstring ppc,$(1)),)
+      HB_HOST_CPU := ppc
+   else ifneq ($(findstring ppc64,$(1)),)
+      HB_HOST_CPU := ppc64
+   else ifneq ($(findstring arm,$(1)),)
+      HB_HOST_CPU := arm
+   else ifneq ($(findstring ia64,$(1)),)
+      HB_HOST_CPU := ia64
+   else ifneq ($(findstring sparc64,$(1)),)
+      HB_HOST_CPU := sparc64
+   else ifneq ($(findstring sparc,$(1)),)
+      HB_HOST_CPU := sparc32
+   else ifneq ($(findstring mips,$(1)),)
+      HB_HOST_CPU := mips
+   else ifneq ($(findstring alpha,$(1)),)
+      HB_HOST_CPU := alpha
+   else ifneq ($(findstring 9000,$(1)),)
+      HB_HOST_CPU := parisc
+   else ifneq ($(findstring parisc,$(1)),)
+      HB_HOST_CPU := parisc
+   else ifneq ($(findstring 86,$(1)),)
       HB_HOST_CPU := x86
+   else ifneq ($(findstring x86_64,$(1)),)
+      HB_HOST_CPU := x86_64
    else ifneq ($(findstring 64,$(1)),)
       HB_HOST_CPU := x86_64
    endif