diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index 2ef8281..f3a0897 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -344,11 +344,11 @@
 # Define what url should JVM offer in case of a crash report
 # order may be important, epel may have rhel declared
 %if 0%{?epel}
-%global oj_vendor_bug_url  https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%{name}&version=epel%{epel}
+%global oj_vendor_bug_url  https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%{component}&version=epel%{epel}
 %else
 %if 0%{?fedora}
 # Does not work for rawhide, keeps the version field empty
-%global oj_vendor_bug_url  https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&version=%{fedora}
+%global oj_vendor_bug_url  https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{component}&version=%{fedora}
 %else
 %if 0%{?rhel}
 %global oj_vendor_bug_url https://access.redhat.com/support/cases/
@@ -2497,6 +2497,7 @@ require "copy_jdk_configs.lua"
 - Require tzdata-java 2024a at runtime and for build (JDK-8325150)
 - Update lcms2 bundled provides to 2.16.0
 - Add zlib 1.3.1 bundled provides and zlib-devel build requirement (OPENJDK-3065)
+- Use component in EPEL and Fedora bug URLs
 
 * Wed Apr 10 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:17.0.11.0.9-2
 - Update to jdk-17.0.11+9 (GA)