diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index fa329f0..7be55b2 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -853,6 +853,7 @@ exit 0
 %license %{_jvmdir}/%{jredir -- %{?1}}/ASSEMBLY_EXCEPTION
 %license %{_jvmdir}/%{jredir -- %{?1}}/LICENSE
 %license %{_jvmdir}/%{jredir -- %{?1}}/THIRD_PARTY_README
+%dir %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}
 %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/NEWS
 %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/README.md
 %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/java-1.%{majorver}.0-openjdk-portable.specfile
@@ -1160,6 +1161,7 @@ exit 0
 
 %define files_javadoc_zip() %{expand:
 %defattr(-,root,root,-)
+%dir %{_javadocdir}/%{uniquejavadocdir -- %{?1}}
 %doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip
 %license %{installoutputdir -- %{?1}}/jre/LICENSE
 }
@@ -2725,6 +2727,7 @@ cjc.mainProgram(args)
 - Explictly define supported architectures
 - Specify portablerelease and rpmrelease (always 0 for portables) in the Release field
 - Make zone string debug output optional in TestTranslations
+- Change javadoc-zip to just own the top-level directory, not include the entire subtree
 - Sync the copy of the portable specfile with the latest update
 - Sync portable naming with later JDKs, due to adoption of <compatiblename> by portable
 - Drop <pversion> which is a redundant alias for version now
@@ -2734,6 +2737,12 @@ cjc.mainProgram(args)
 - Resolves: RHEL-212132
 - Resolves: RHEL-212311
 - Resolves: RHEL-212317
+- Related: RHEL-212322
+
+* Fri Jul 17 2026 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:1.8.0.502.b07-1.1
+- Make headless own /usr/share/doc/java-1.8.0-openjdk
+- Make javadoc-zip own /usr/share/javadoc/java-1.8.0-openjdk
+- Resolves: RHEL-212322
 
 * Fri Apr 17 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.492.b09-1
 - Update to 8u492-b09 (GA)