diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index 870111b..0bf9d8c 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.spec
@@ -51,7 +51,7 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?phase:-}%{?phase}
 # Fix pkiparser.py to work with Python 3.12
 Patch0: 0001-Handle-removal-of-ConfigParser.readfp-in-Python-3.12.patch
 
-%if 0%{?fedora} && 0%{?fedora} > 35
+%if 0%{?fedora} > 35 || 0%{?rhel} > 9
 ExclusiveArch: %{java_arches}
 %else
 ExcludeArch: i686
@@ -748,7 +748,7 @@ Provides:         pki-server-theme = %{version}-%{release}
 Obsoletes:        %{product_id}-server-theme < %{version}-%{release}
 Provides:         %{product_id}-server-theme = %{version}-%{release}
 
-%if 0%{?fedora} > 38
+%if 0%{?fedora} > 38 || 0%{?rhel} > 9
 Requires:         fontawesome4-fonts-web
 %else
 Requires:         fontawesome-fonts-web
@@ -872,7 +872,7 @@ pkgs=base\
 
 # Unbundle the FontAwesome fonts
 rm %{buildroot}%{_datadir}/pki/common-ui/fonts/fontawesome-webfont.woff
-%if 0%{?fedora} > 38
+%if 0%{?fedora} > 38 || 0%{?rhel} > 9
 ln -s ../../../fonts/fontawesome4/fontawesome-webfont.woff \
     %{buildroot}%{_datadir}/pki/common-ui/fonts/fontawesome-webfont.woff
 %else