--- build/make/configure.sh
+++ build/make/configure.sh
@@ -539,6 +539,12 @@
             *powerpc*)
                 tgt_isa=ppc32
                 ;;
+            *s390x*)
+                tgt_isa=s390x
+                ;;
+            *s390*)
+                tgt_isa=s390
+                ;;
             *sparc*)
                 tgt_isa=sparc
                 ;;
--- configure
+++ configure
@@ -102,6 +102,8 @@
 all_platforms="${all_platforms} ppc64-darwin8-gcc"
 all_platforms="${all_platforms} ppc64-darwin9-gcc"
 all_platforms="${all_platforms} ppc64-linux-gcc"
+all_platforms="${all_platforms} s390-linux-gcc"
+all_platforms="${all_platforms} s390x-linux-gcc"
 all_platforms="${all_platforms} sparc-solaris-gcc"
 all_platforms="${all_platforms} x86-darwin8-gcc"
 all_platforms="${all_platforms} x86-darwin8-icc"