diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index 855351e7..f680dddc 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -684,6 +684,30 @@
       <packagereq type="optional">xorg-x11-fonts-cyrillic</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>cloud-infrastructure</id>
+    <_name>Cloud Infrastructure</_name>
+    <_description>Infrastructure packages for cloud computing.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="optional">aeolus-all</packagereq>
+      <packagereq type="optional">boxgrinder</packagereq>
+      <packagereq type="optional">ceph</packagereq>
+      <packagereq type="optional">deltacloud-core-all</packagereq>
+      <packagereq type="optional">euca2ools</packagereq>
+      <packagereq type="optional">glusterfs</packagereq>
+      <packagereq type="optional">hail</packagereq>
+      <packagereq type="optional">hekafs</packagereq>
+      <packagereq type="optional">imagefactory</packagereq>
+      <packagereq type="optional">iwhd</packagereq>
+      <packagereq type="optional">openstack-glance</packagereq>
+      <packagereq type="optional">openstack-swift</packagereq>
+      <packagereq type="optional">pacemaker-cloud</packagereq>
+      <packagereq type="optional">sheepdog</packagereq>
+      <packagereq type="optional">tabled</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>clustering</id>
     <_name>Clustering</_name>