diff --git a/libreoffice.spec b/libreoffice.spec
index 48576f1..a29ea53 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -34,13 +34,6 @@
 # effect
 %bcond_without langpacks
 
-# remove workdir at the end of %%build, to allow build on space-constrained machines
-%ifarch s390 s390x
-%bcond_without smallbuild
-%else
-%bcond_with smallbuild
-%endif
-
 # 'serverconfig' is tuned for non-interactive installs
 # defaults off except on rhel for s390[x] and aarch64
 %if 0%{?rhel}
@@ -1028,16 +1021,9 @@ for i in $RPM_OPT_FLAGS; do
         case "$i" in
                 -pipe|-Wall|-Werror*|-fexceptions) continue;;
         esac
-%ifarch s390x
-        # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106355
-        case "$i" in
-                -O2|-Wp,-D_FORTIFY_SOURCE=2)
-                continue;;
-        esac
-%endif
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
-%ifarch s390 %{arm} aarch64
+%ifarch s390 s390x %{arm} aarch64
 # these builders typically do not have enough memory to link the big libs with -g2
 ARCH_FLAGS="$ARCH_FLAGS -g1"
 %endif
@@ -1114,6 +1100,9 @@ touch autogen.lastrun
  %{?archoptions} \
  %{?flatpakoptions}
 
+%ifarch s390x
+make verbose=true GMAKE_OPTIONS=-rj1 build
+%else
 if ! make verbose=true build; then
     echo "build attempt 1 failed"
     if ! make verbose=true build; then
@@ -1121,6 +1110,7 @@ if ! make verbose=true build; then
         make verbose=true GMAKE_OPTIONS=-rj1 build
     fi
 fi
+%endif
 
 #generate the icons and mime type stuff
 export DESTDIR=../output
@@ -1138,14 +1128,11 @@ mkdir $WORKDIR/os-integration
 cp -pr $WORKDIR/CustomTarget/sysui/share/output/usr/share/* $WORKDIR/os-integration
 cp -pr $WORKDIR/CustomTarget/sysui/share/libreoffice/LOKDocView-%{girapiversion}.* $WORKDIR/os-integration
 
-%if %{with smallbuild}
+%install
+# remove workdir before install, to allow build on space-constrained machines
 # remove the biggest offenders
-# NOTE: not removing complete LinkTarget, as some libs are needed for smoketest
-rm -rf $WORKDIR/CxxObject $WORKDIR/GenCxxObject $WORKDIR/HelpTarget $WORKDIR/LinkTarget/CppunitTest
-%endif
-
+rm -rf $WORKDIR/CxxObject $WORKDIR/GenCxxObject $WORKDIR/HelpTarget $WORKDIR/LinkTarget
 
-%install
 # TODO investigate use of make distro-pack-install
 #figure out the icon version
 . ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION SRCDIR WORKDIR