diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index dcd845e..de8b131 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -875,6 +875,7 @@ exit 0
 
 %define files_jre_headless() %{expand:
 %license %{_jvmdir}/%{sdkdir -- %{?1}}/legal
+%dir %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}
 %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/NEWS
 %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/README.md
 %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/java-%{featurever}-openjdk-portable.specfile
@@ -1156,6 +1157,7 @@ exit 0
 }
 
 %define files_javadoc_zip() %{expand:
+%dir %{_javadocdir}/%{uniquejavadocdir -- %{?1}}
 %doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip
 %license %{_jvmdir}/%{sdkdir -- %{?1}}/legal
 %if %is_system_jdk
@@ -2589,6 +2591,7 @@ cjc.mainProgram(args)
 - Specify portablerelease and rpmrelease (always 0 for portables) in the Release field
 - Obsolete old RHEL releases (9.7.0-z, 10.1-z)
 - 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
 - ** This tarball is embargoed until 2026-07-21 @ 1pm PT. **
 - Resolves: RHEL-212332
@@ -2599,13 +2602,17 @@ cjc.mainProgram(args)
 - Resolves: RHEL-188866
 - Resolves: RHEL-212345
 - Resolves: RHEL-212347
+- Related: RHEL-212349
 
 * Sat Jul 18 2026 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:21.0.11.0.10-1.3
 - Disable abidiff inspection in rpminspect.yaml to avoid an out-of-memory error on the CentOS test farm
 - See: https://docs.testing-farm.io/Testing%20Farm/0.1/errors.html#TFE-1
 - Do not overwrite slowdebug __provides_exclude_from and __requires_exclude_from regexps
+- 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-151167
 - Resolves: RHEL-212348
+- Resolves: RHEL-212349
 
 * Mon Apr 20 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.11.0.10-2
 - Bump release for PQC build