diff --git a/webkitgtk.spec b/webkitgtk.spec
index f890b2a..df3245f 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -306,11 +306,13 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
 # Require 32 GB of RAM per vCPU for debuginfo processing. 16 GB is not enough.
 %global _find_debuginfo_opts %limit_build -m 32768
 
-# Remove debuginfo from 32-bit builds to reduce memory consumption even more.
-# No amount of optimizing is going to work here.
+# Reduce debuginfo verbosity 32-bit builds to reduce memory consumption even more.
 # https://bugs.webkit.org/show_bug.cgi?id=140176
 # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/I6IVNA52TXTBRQLKW45CJ5K4RA4WNGMI/
-%ifarch %{ix86}
+#
+# Do this for s390x too as a temporary measure.
+# https://pagure.io/fedora-infrastructure/issue/11000
+%ifarch %{ix86} s390x
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif