diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index 708b2b9..a2a3fbe 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -392,7 +392,12 @@
 %global rpmrelease      2
 # Settings used by the portable build
 %global portablerelease 1
+# Portable suffix differs between RHEL and CentOS
+%if 0%{?centos} == 0
+%global portablesuffix 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
@@ -2506,6 +2511,10 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Sun Aug 04 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.12.0.7-2
+- Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9')
+- Related: RHEL-52734
+
 * Sun Aug 04 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.12.0.7-2
 - Update to jdk-17.0.12+7 (GA)
 - Update .gitignore to ignore openjdk-17.0.12+7.tar.xz