--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -697,6 +697,12 @@ process_common_toolchain() {
       *i[3456]86*)
         tgt_isa=x86
         ;;
+      *s390x*)
+        tgt_isa=s390x
+        ;;
+      *s390*)
+        tgt_isa=s390
+        ;;
       *sparc*)
         tgt_isa=sparc
         ;;
--- a/configure
+++ b/configure
@@ -114,6 +114,8 @@ all_platforms="${all_platforms} armv7s-d
 all_platforms="${all_platforms} armv8-linux-gcc"
 all_platforms="${all_platforms} mips32-linux-gcc"
 all_platforms="${all_platforms} mips64-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-android-gcc"
 all_platforms="${all_platforms} x86-darwin8-gcc"