diff --git a/comps-f10.xml.in b/comps-f10.xml.in
index be0d6ba9..0c36ee81 100644
--- a/comps-f10.xml.in
+++ b/comps-f10.xml.in
@@ -2474,7 +2474,6 @@
       <packagereq type="default">jakarta-oro-javadoc</packagereq>
       <packagereq type="default">jakarta-taglibs-standard</packagereq>
       <packagereq type="default">jakarta-taglibs-standard-javadoc</packagereq>
-      <packagereq type="default">java-1.5.0-gcj-javadoc</packagereq>
       <packagereq type="default">java-1.5.0-gcj-src</packagereq>
       <packagereq type="default">java-1.6.0-openjdk-demo</packagereq>
       <packagereq type="default">java-1.6.0-openjdk-devel</packagereq>
@@ -2524,6 +2523,7 @@
       <packagereq type="default">xml-commons-resolver-javadoc</packagereq>
       <packagereq type="default">xml-commons-which</packagereq>
       <packagereq type="default">xml-commons-which-javadoc</packagereq>
+      <packagereq type="optional">java-1.5.0-gcj-javadoc</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/comps-f9.xml.in b/comps-f9.xml.in
index 894795ae..73816dbd 100644
--- a/comps-f9.xml.in
+++ b/comps-f9.xml.in
@@ -2478,7 +2478,6 @@
       <packagereq type="default">jakarta-oro-javadoc</packagereq>
       <packagereq type="default">jakarta-taglibs-standard</packagereq>
       <packagereq type="default">jakarta-taglibs-standard-javadoc</packagereq>
-      <packagereq type="default">java-1.5.0-gcj-javadoc</packagereq>
       <packagereq type="default">java-1.5.0-gcj-src</packagereq>
       <packagereq type="default">java-1.6.0-openjdk-demo</packagereq>
       <packagereq type="default">java-1.6.0-openjdk-devel</packagereq>
@@ -2528,6 +2527,7 @@
       <packagereq type="default">xml-commons-resolver-javadoc</packagereq>
       <packagereq type="default">xml-commons-which</packagereq>
       <packagereq type="default">xml-commons-which-javadoc</packagereq>
+      <packagereq type="optional">java-1.5.0-gcj-javadoc</packagereq>
     </packagelist>
   </group>
   <group>