diff --git a/configure b/configure
index ced4d2fa10..c0d8aa52b9 100755
--- a/configure
+++ b/configure
@@ -193,6 +193,12 @@ elif check_define __mips__ ; then
   cpu="mips"
 elif check_define __ia64__ ; then
   cpu="ia64"
+elif check_define __s390__ ; then
+  if check_define __s390x__ ; then
+    cpu="s390x"
+  else
+    cpu="s390"
+  fi
 else
   cpu=`uname -m`
 fi