Index: pegasus-wms_4.0.1+dfsg/release-tools/getsystem/getsystem
===================================================================
--- pegasus-wms_4.0.1+dfsg.orig/release-tools/getsystem/getsystem	2012-05-24 15:12:47.023867019 -0700
+++ pegasus-wms_4.0.1+dfsg/release-tools/getsystem/getsystem	2012-05-29 09:29:12.044630165 -0700
@@ -42,7 +42,9 @@
     "x86_64", "x86_64",
     "X86-based PC", "x86",
     "HP-UX", "hppa",
-    "arm", "arm"
+    "arm", "arm",
+    "s390", "s390",
+    "s390x", "s390x"
 );
 
 # Override the flags based on a system
@@ -113,8 +115,11 @@
 
     if ( lc($os) eq "linux") {
         my %distro = &get_linux_distro();
-
-      return($short_arch{$arch},$distro{'short'},$distro{'version'});
+        my $s_arch = $arch;
+        if (defined $short_arch{$arch}) {
+            $s_arch = $short_arch{$arch};
+        }
+        return($s_arch,$distro{'short'},$distro{'version'});
     }
     elsif($short_os{$os} eq "macos") { # need something like 'ppc_macos_10.3' 
      # find if processor is 64 bit.
Index: pegasus-wms_4.0.1+dfsg/src/tools/pegasus-cluster/Makefile
===================================================================
--- pegasus-wms_4.0.1+dfsg.orig/src/tools/pegasus-cluster/Makefile	2012-05-24 15:12:47.155867670 -0700
+++ pegasus-wms_4.0.1+dfsg/src/tools/pegasus-cluster/Makefile	2012-05-29 08:35:40.224703954 -0700
@@ -57,12 +57,6 @@
 else
 ifeq (armv7l, ${MARCH})
 # nothing to do
-else
-#
-# Linux IA32
-#
-CFLAGS	+= -march=i686
-# LDFLAGS	+= -static
 endif
 endif
 endif
Index: pegasus-wms_4.0.1+dfsg/src/tools/pegasus-invoke/Makefile
===================================================================
--- pegasus-wms_4.0.1+dfsg.orig/src/tools/pegasus-invoke/Makefile	2012-05-24 15:12:47.147867638 -0700
+++ pegasus-wms_4.0.1+dfsg/src/tools/pegasus-invoke/Makefile	2012-05-29 08:34:24.784329862 -0700
@@ -63,9 +63,9 @@
 CFLAGS  = -Wall -O2 -ggdb -m64
 else
 ifeq (armv7l,${MARCH})
-CFLAGS	= -Wall -02 -ggdb
+CFLAGS	= -Wall -O2 -ggdb
 else
-CFLAGS  = -Wall -O2 -march=i686 -ggdb
+CFLAGS  = -Wall -O2 -ggdb
 #EXTRA_LDFLAGS += -static
 endif
 endif
Index: pegasus-wms_4.0.1+dfsg/src/tools/pegasus-keg/Makefile
===================================================================
--- pegasus-wms_4.0.1+dfsg.orig/src/tools/pegasus-keg/Makefile	2012-05-24 15:12:47.147867638 -0700
+++ pegasus-wms_4.0.1+dfsg/src/tools/pegasus-keg/Makefile	2012-05-29 08:36:28.156941640 -0700
@@ -99,7 +99,7 @@
 ifeq (armv7l, ${MARCH})
 CXXFLAGS = -Wall -O2 -ggdb
 else
-CXXFLAGS  = -Wall -O2  -march=i686 -ggdb
+CXXFLAGS  = -Wall -O2 -ggdb
 #LDFLAGS += -static
 endif
 endif
