diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index 0b365ce..49b0f22 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -360,10 +360,15 @@
 %global top_level_dir_name   %{vcstag}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
 %global buildver        7
-%global rpmrelease      1
+%global rpmrelease      2
 # Settings used by the portable build
 %global portablerelease 1
-%global portablesuffix %{?pkgos:el7_9}%{!?pkgos:el9}
+# Portable suffix differs between RHEL and CentOS
+%if 0%{?centos} == 0
+%global portablesuffix %{?pkgos:el7_9}%{!?pkgos:el8}
+%else
+%global portablesuffix el9
+%endif
 %global portablebuilddir /builddir/build/BUILD
 
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
@@ -2517,6 +2522,10 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Mon Oct 07 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.4.0.7-2
+- Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9')
+- Related: RHEL-58797
+
 * Fri Jul 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.4.0.7-1
 - Update to jdk-21.0.4+7 (GA)
 - Update release notes to 21.0.4+7