diff --git a/clisp.spec b/clisp.spec
index 02fe5e3..6d83949 100644
--- a/clisp.spec
+++ b/clisp.spec
@@ -54,6 +54,9 @@ BuildRequires:  db-devel
 BuildRequires:  dbus-1-devel
 BuildRequires:  fdupes
 BuildRequires:  ffcall
+%ifarch s390x
+BuildRequires:  gcc8
+%endif
 BuildRequires:  gdbm-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  libglade2-devel
@@ -151,7 +154,7 @@ else
     CC="gcc"
 fi
 %ifarch s390x
-RPM_OPT_FLAGS="$(echo %{optflags}|sed -r 's/-fstack-protector-strong ?//g;s/-f(stack-clash-protection)/-fno-\1/') -fno-stack-limit"
+##RPM_OPT_FLAGS="$(echo %{optflags}|sed -r 's/-fstack-protector-strong ?//g;s/-f(stack-clash-protection)/-fno-\1/') -fno-stack-limit"
 %endif
 CC="${CC} -g ${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -pipe"
 case "$(uname -m)" in
@@ -190,10 +193,9 @@ MYCFLAGS="${MYCFLAGS} -Wno-unused -Wno-uninitialized -Wno-implicit-fallthrough -
 # optimizations but also enables some debugging features (STACKCHECKs), which
 # is not in the scope of --enable-portability.
 # </cite>
-%ifarch s390x
-port='--enable-portability'
-%else
 port=''
+%ifarch s390x
+##port='--enable-portability'
 %endif
 case "$(uname -m)" in
     i[0-9]86)
@@ -262,10 +264,6 @@ find -name configure | xargs -r \
 > $SCREENLOG
 tail -q -s 0.5 -f $SCREENLOG & pid=$!
 %_configure build ${DEBUG}	\
-%ifarch s390x
-    --build=s390x-ibm-linux-gnu	\
-    --host=s390x-nixda-gnu	\
-%endif
     ${port+"$port"}		\
     --prefix=%{_prefix}		\
     --exec-prefix=%{_prefix}	\