diff -up commons-daemon-1.0.5-src/src/native/unix/configure.s390 commons-daemon-1.0.5-src/src/native/unix/configure
--- commons-daemon-1.0.5-src/src/native/unix/configure.s390	2011-05-04 16:04:10.000000000 +0200
+++ commons-daemon-1.0.5-src/src/native/unix/configure	2011-05-04 16:12:04.000000000 +0200
@@ -3030,10 +3030,9 @@ $as_echo "failed" >&6; }
     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\\\""
+    HOST_CPU=$host_cpu;;
   *)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
 $as_echo "failed" >&6; }