diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index 39c3479c..7e4a8028 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -79,6 +79,44 @@
     <packagelist>
     </packagelist>
   </group>
+  <group>
+    <id>anaconda-tools</id>
+    <_name>Anaconda tools</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">authconfig</packagereq>
+      <packagereq type="default">btrfs-progs</packagereq>
+      <packagereq type="default">chkconfig</packagereq>
+      <packagereq type="default">cryptsetup-luks</packagereq>
+      <packagereq type="default">device-mapper-multipath</packagereq>
+      <packagereq type="default">dmraid</packagereq>
+      <packagereq type="default">dosfstools</packagereq>
+      <packagereq type="default">dracut-network</packagereq>
+      <packagereq type="default">e2fsprogs</packagereq>
+      <packagereq type="default">efibootmgr</packagereq>
+      <packagereq type="default">fcoe-utils</packagereq>
+      <packagereq type="default">gfs2-utils</packagereq>
+      <packagereq type="default">grub2</packagereq>
+      <packagereq type="default">grub-efi</packagereq>
+      <packagereq type="default">grub</packagereq>
+      <packagereq type="default">hfsplus-tools</packagereq>
+      <packagereq type="default">iscsi-initiator-utils</packagereq>
+      <packagereq type="default">lvm2</packagereq>
+      <packagereq type="default">mactel-boot</packagereq>
+      <packagereq type="default">mdadm</packagereq>
+      <packagereq type="default">ntfsprogs</packagereq>
+      <packagereq type="default">reiserfs-utils</packagereq>
+      <packagereq type="default">s390utils-base</packagereq>
+      <packagereq type="default">s390utils</packagereq>
+      <packagereq type="default">silo</packagereq>
+      <packagereq type="default">system-config-firewall-base</packagereq>
+      <packagereq type="default">tboot</packagereq>
+      <packagereq type="default">xfsprogs</packagereq>
+      <packagereq type="default">yaboot</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>arabic-support</id>
     <_name>Arabic Support</_name>
diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 71ba7e51..63c48100 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -38,6 +38,44 @@
       <packagereq type="optional">yumex</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>anaconda-tools</id>
+    <_name>Anaconda tools</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">authconfig</packagereq>
+      <packagereq type="default">btrfs-progs</packagereq>
+      <packagereq type="default">chkconfig</packagereq>
+      <packagereq type="default">cryptsetup-luks</packagereq>
+      <packagereq type="default">device-mapper-multipath</packagereq>
+      <packagereq type="default">dmraid</packagereq>
+      <packagereq type="default">dosfstools</packagereq>
+      <packagereq type="default">dracut-network</packagereq>
+      <packagereq type="default">e2fsprogs</packagereq>
+      <packagereq type="default">efibootmgr</packagereq>
+      <packagereq type="default">fcoe-utils</packagereq>
+      <packagereq type="default">gfs2-utils</packagereq>
+      <packagereq type="default">grub2</packagereq>
+      <packagereq type="default">grub-efi</packagereq>
+      <packagereq type="default">grub</packagereq>
+      <packagereq type="default">hfsplus-tools</packagereq>
+      <packagereq type="default">iscsi-initiator-utils</packagereq>
+      <packagereq type="default">lvm2</packagereq>
+      <packagereq type="default">mactel-boot</packagereq>
+      <packagereq type="default">mdadm</packagereq>
+      <packagereq type="default">ntfsprogs</packagereq>
+      <packagereq type="default">reiserfs-utils</packagereq>
+      <packagereq type="default">s390utils-base</packagereq>
+      <packagereq type="default">s390utils</packagereq>
+      <packagereq type="default">silo</packagereq>
+      <packagereq type="default">system-config-firewall-base</packagereq>
+      <packagereq type="default">tboot</packagereq>
+      <packagereq type="default">xfsprogs</packagereq>
+      <packagereq type="default">yaboot</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>arabic-support</id>
     <_name>Arabic Support</_name>