diff -r 14abcd185e4b -r 3167f947f93f scripts/build/arch/s390.sh
--- a/scripts/build/arch/s390.sh	Mon Nov 16 20:18:09 2009 +0100
+++ b/scripts/build/arch/s390.sh	Tue Nov 17 11:54:44 2009 +0100
@@ -1,6 +1,8 @@
 # Compute s390-specific values
 
 CT_DoArchTupleValues() {
-    # Defaults are all OK for s390
-    :
+    # That's the only thing to override
+    if [ "${CT_ARCH_64}" = "y" ]; then
+        CT_TARGET_ARCH="s390x"
+    fi
 }