diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index 882754f..90b6aec 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -236,7 +236,13 @@
 %global vm_variant server
 
 # debugedit tool for rewriting ELF file paths
+%if 0%{?rhel} >= 10
+# From RHEL 10, the tool is in its own package installed in the usual location
+%global debugedit %{_bindir}/debugedit
+%else
+# On earlier versions of RHEL, it is part of the rpm package
 %global debugedit %{_rpmconfigdir}/debugedit
+%endif
 
 # Filter out flags from the optflags macro that cause problems with the OpenJDK build
 # We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
@@ -1416,6 +1422,10 @@ BuildRequires: automake
 BuildRequires: alsa-lib-devel
 BuildRequires: binutils
 BuildRequires: cups-devel
+# From RHEL 10, debugedit is in its own package
+%if 0%{?rhel} >= 10
+BuildRequires: debugedit
+%endif
 BuildRequires: desktop-file-utils
 # elfutils only are OK for build without AOT
 BuildRequires: elfutils-devel
@@ -2489,8 +2499,10 @@ cjc.mainProgram(args)
 * Wed Jul 31 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.11.0.9-2
 - Fix gating.yaml to reference RHEL 10
 - Set this to *not* be the default/system JDK providing 'java', 'jre', 'java-devel' ,etc.
+- Handle debugedit being a separate package installed in /usr on RHEL/CentOS 10
 - Resolves: RHEL-45722
 - Resolves: RHEL-51870
+- Related: RHEL-45216
 
 * Thu Apr 11 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.11.0.9-2
 - Update to jdk-17.0.11+9 (GA)