diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index a5243782..3c3855e4 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -3586,7 +3586,6 @@
       <packagereq type="mandatory">java-1.7.0-openjdk</packagereq>
       <packagereq type="default">icedtea-web</packagereq>
       <packagereq type="optional">java-1.5.0-gcj</packagereq>
-      <packagereq type="optional">java-1.6.0-openjdk</packagereq>
       <packagereq type="optional">libgcj</packagereq>
     </packagelist>
   </group>
@@ -3661,10 +3660,6 @@
       <packagereq type="optional">ant-findbugs</packagereq>
       <packagereq type="optional">findbugs</packagereq>
       <packagereq type="optional">findbugs-tools</packagereq>
-      <packagereq type="optional">java-1.6.0-openjdk-demo</packagereq>
-      <packagereq type="optional">java-1.6.0-openjdk-devel</packagereq>
-      <packagereq type="optional">java-1.6.0-openjdk-javadoc</packagereq>
-      <packagereq type="optional">java-1.6.0-openjdk-src</packagereq>
       <packagereq type="optional">jcip-annotations</packagereq>
       <packagereq type="optional">jsr-305</packagereq>
       <packagereq type="optional">pmd</packagereq>
diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 55221ad4..3afa650a 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -3223,7 +3223,6 @@
       <packagereq type="mandatory">java-1.7.0-openjdk</packagereq>
       <packagereq type="default">icedtea-web</packagereq>
       <packagereq type="optional">java-1.5.0-gcj</packagereq>
-      <packagereq type="optional">java-1.6.0-openjdk</packagereq>
       <packagereq type="optional">libgcj</packagereq>
     </packagelist>
   </group>
@@ -3298,10 +3297,6 @@
       <packagereq type="optional">ant-findbugs</packagereq>
       <packagereq type="optional">findbugs</packagereq>
       <packagereq type="optional">findbugs-tools</packagereq>
-      <packagereq type="optional">java-1.6.0-openjdk-demo</packagereq>
-      <packagereq type="optional">java-1.6.0-openjdk-devel</packagereq>
-      <packagereq type="optional">java-1.6.0-openjdk-javadoc</packagereq>
-      <packagereq type="optional">java-1.6.0-openjdk-src</packagereq>
       <packagereq type="optional">jcip-annotations</packagereq>
       <packagereq type="optional">jsr-305</packagereq>
       <packagereq type="optional">pmd</packagereq>