diff --git a/AUTHORS b/AUTHORS
index 5a4e4955da..aef9a2ef62 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -238,6 +238,7 @@ Patches have also been contributed by:
   Gao feng             <gaofeng@cn.fujitsu.com>
   Dipankar Sarma       <dipankar@in.ibm.com>
   Viktor Mihajlovski   <mihajlov@linux.vnet.ibm.com>
+  Thang Pham           <thang.pham@us.ibm.com>
 
   [....send patches to get your name here....]
 
diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 56b9f54cdb..3594ec25cc 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -275,6 +275,11 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo,
              * and parsed in next iteration, because it is not in expected
              * format and thus lead to error. */
         }
+# elif defined(__s390__) || \
+      defined(__s390x__)
+        /* s390x has no realistic value for CPU speed,
+         * assign a value of zero to signify this */
+        nodeinfo->mhz = 0;
 # else
 #  warning Parser for /proc/cpuinfo needs to be adapted for your architecture
 # endif