diff --git a/clisp.spec b/clisp.spec
index 3c256cd..fd5d5b3 100644
--- a/clisp.spec
+++ b/clisp.spec
@@ -172,7 +172,7 @@ else
     CC="gcc"
 fi
 %ifarch s390x
-%{expand:%%global optflags %(echo "%{optflags}"|sed -r -e s/-fstack-protector-strong// -e s/-fstack-clash-protection//)}
+%{expand:%%global optflags %(echo "%{optflags}"|sed -r -e s/-fstack-protector-strong// -e s/-fstack-clash-protection// -e "s/(-D_FORTIFY_SOURCE)=3/\1=2/")}
 %endif
 CC="${CC} -g %{optflags} -fno-strict-aliasing -fPIC -pipe"
 case "$(uname -m)" in
@@ -315,9 +315,8 @@ tail -q -s 0.5 -f $SCREENLOG & pid=$!
     --with-module=berkeley-db	\
     --with-module=postgresql	\
     --config			\
-    build			\
     CC="${CC}"			\
-    CFLAGS="%{build_cflags} ${MYCFLAGS} -Wa,--noexecstack" \
+    CFLAGS="${MYCFLAGS} -Wa,--noexecstack" \
     LDFLAGS="-Wl,--as-needed -Wl,-z,relro -Wl,-z,noexecstack"
 
 %_make -C build lispbibl.h