diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index 68f05d8..097affc 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -999,8 +999,8 @@ fi
 }
 
 %define files_javadoc_zip() %{expand:
+%dir %{_javadocdir}/%{uniquejavadocdir -- %{?1}}
 %doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip
-%doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}
 %if %is_system_jdk
 %if %{is_release_build -- %{?1}}
 %ghost %{_javadocdir}/java-zip
@@ -2461,6 +2461,7 @@ exit 0
 - Attempt to avoid conflicts between subpackages
   - Make javadoc packages depend on headless package for legal documentation
   - Only include legal subdirectory in headless package, not demo, src & javadoc{,-zip}
+  - Change javadoc-zip to just own the top-level directory, not include the entire subtree
 - Resolves: RHEL-78710
 
 * Thu Feb 06 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.6.0.7-1