diff --git a/x2goserver.spec b/x2goserver.spec
index bc328f6..e479cc7 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -62,7 +62,7 @@ Requires(post): x2goserver-common
 %{?systemd_requires}
 %endif
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Suggests:       x2goserver-fmbindings = %{version}-%{release}
 Suggests:       x2goserver-printing = %{version}-%{release}
 %endif
@@ -73,7 +73,7 @@ Requires:       x2goserver-xsession = %{version}-%{release}
 Obsoletes:      x2goserver-extensions < %{version}-%{release}
 Provides:       x2goserver-extensions = %{version}-%{release}
 Requires:       x2goserver-xsession
-%if 0%{?fedora} >= 21
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Suggests:       x2goserver-fmbindings
 Suggests:       x2goserver-printing
 %endif
@@ -188,10 +188,11 @@ Summary:        X2Go Server Xsession runner
 Requires:       %{name} = %{version}-%{release}
 # Not detected automatically
 Requires:       perl(Cwd)
-Requires:       xmessage
+# For xmessage
+Requires:       xorg-x11-apps
 # Symlinks to xinit files
 Requires:       xorg-x11-xinit
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Requires:       dbus
 %endif
 BuildArch:      noarch
@@ -602,15 +603,6 @@ exit 0
 * Tue May 30 2023 Orion Poplawski <orion@nwra.com> - 4.1.0.4-1
 - Update to 4.1.0.4
 
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.3-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 4.1.0.3-18
-- Perl 5.36 rebuild
-
 * Fri Feb 04 2022 Orion Poplawski <orion@nwra.com> - 4.1.0.3-17
 - Add upstream patch to fix x2goversion (bz#2050350)