diff --git a/libreoffice.spec b/libreoffice.spec
index 0131c42..650e0cb 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -41,6 +41,13 @@
 %bcond_with smallbuild
 %endif
 
+# 'serverconfig' is tuned for non-interactive installs
+%ifarch s390 s390x aarch64
+%bcond_with serverconfig
+%else
+%bcond_without serverconfig
+%endif
+
 # generated by %%langpack definitions
 %global langpack_langs %{nil}
 
@@ -50,7 +57,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        4%{?libo_prerelease}%{?dist}
+Release:        5%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
 URL:            http://www.libreoffice.org/
 
@@ -299,7 +306,9 @@ Summary: Core modules for LibreOffice
 Requires: %{name}-%{fontname}-fonts = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: %{name}-data = %{epoch}:%{version}-%{release}
+%if ! %{with serverconfig}
 Requires: %{name}-plugin%{?_isa} = %{epoch}:%{version}-%{release}
+%endif
 Requires: liberation-sans-fonts, liberation-serif-fonts, liberation-mono-fonts
 Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts
 Requires: google-crosextra-caladea-fonts, google-crosextra-carlito-fonts
@@ -1355,7 +1364,12 @@ for file in *.desktop; do
         $file
 done
 # rhbz#186515 do not show startcenter
-sed -i -e /NoDisplay/s/false/true/ startcenter.desktop
+desktop-file-edit --set-key=NoDisplay --set-value=true startcenter.desktop
+%if %{with serverconfig}
+for app in base calc draw impress math startcenter writer xsltfilter; do
+    desktop-file-edit --set-key=NoDisplay --set-value=true $app.desktop
+done
+%endif
 # relocate the .desktop and icon files
 install -m 0755 -d %{buildroot}%{_datadir}/applications
 for app in base calc draw impress math startcenter writer xsltfilter; do
@@ -2249,6 +2263,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
 %{_includedir}/LibreOfficeKit
 
 %changelog
+* Tue Feb 01 2022 Caolán McNamara <caolanm@redhat.com> - 1:7.2.5.2-5
+- Related: rhbz#2029810 set NoDisplay=true for .desktop on s390x/aarch64
+- Related: rhbz#2029810 don't Require any vclplug for s390x/aarch64
+
 * Mon Jan 24 2022 Parag Nemade <pnemade AT redhat DOT com> - 1:7.2.5.2-4
 - Update hunspell dictionary directory path
   https://fedoraproject.org/wiki/Changes/Hunspell_dictionary_dir_change