--- src/native/unix/configure	2010-10-22 02:50:05.751594395 +0200
+++ src/native/unix/configure	2010-10-22 02:51:03.501471420 +0200
@@ -2478,10 +2478,10 @@
     CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\""
     supported_os="ia64"
     HOST_CPU=ia64;;
-  s390)
-    CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
-    supported_os="s390"
-    HOST_CPU=s390;;
+  s390*)
+    CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
+    supported_os="$host_cpu"
+    HOST_CPU=$host_cpu;;
   *)
     echo "$as_me:$LINENO: result: failed" >&5
 echo "${ECHO_T}failed" >&6