diff --git a/c5-i386-comps.xml b/c5-i386-comps.xml
index 8ffeb90..cde3993 100644
--- a/c5-i386-comps.xml
+++ b/c5-i386-comps.xml
@@ -747,8 +747,6 @@
       <packagereq type="default">cpuspeed</packagereq>
       <packagereq type="default">crash</packagereq>
       <packagereq type="default">cryptsetup-luks</packagereq>
-      <packagereq type="default">dhclient</packagereq>
-      <packagereq type="default">dhcpv6-client</packagereq>
       <packagereq type="default">dmraid</packagereq>
       <packagereq type="default">dos2unix</packagereq>
       <packagereq type="default">dosfstools</packagereq>
@@ -767,14 +765,12 @@
       <packagereq type="default">jwhois</packagereq>
       <packagereq type="default">krb5-workstation</packagereq>
       <packagereq type="default">ksh</packagereq>
-	          <packagereq type="default">ksh</packagereq>
       <packagereq type="default">lftp</packagereq>
       <packagereq type="default">libaio</packagereq>
       <packagereq type="default">logwatch</packagereq>
       <packagereq type="default">m2crypto</packagereq>
       <packagereq type="default">man-pages-overrides</packagereq>
       <packagereq type="default">man-pages</packagereq>
-      <packagereq type="default">mdadm</packagereq>
       <packagereq type="default">mgetty</packagereq>
       <packagereq type="default">microcode_ctl</packagereq>
       <packagereq type="default">mkbootdisk</packagereq>
@@ -792,7 +788,6 @@
       <packagereq type="default">numactl</packagereq>
       <packagereq type="default">oddjob</packagereq>
       <packagereq type="default">OpenIPMI</packagereq>
-      <packagereq type="default">openssh-clients</packagereq>
       <packagereq type="default">pam_ccreds</packagereq>
       <packagereq type="default">pam_krb5</packagereq>
       <packagereq type="default">pam_passwdqc</packagereq>
@@ -846,7 +841,6 @@
       <packagereq type="default">yum-updatesd</packagereq>
       <packagereq type="default">zip</packagereq>
       <packagereq type="mandatory">acl</packagereq>
-	          <packagereq type="mandatory">acl</packagereq>
       <packagereq type="mandatory">at</packagereq>
       <packagereq type="mandatory">attr</packagereq>
       <packagereq type="mandatory">authconfig</packagereq>
@@ -2060,10 +2054,12 @@
    <default>true</default>
    <uservisible>false</uservisible>
    <packagelist>
-         <packagereq type="default">Deployment_Guide-en-US</packagereq>
+      <packagereq type="optional">Deployment_Guide-en-US</packagereq>
+      <packagereq type="default">dhclient</packagereq>
+      <packagereq type="default">dhcpv6-client</packagereq>
       <packagereq type="default">gnu-efi</packagereq>
-	          <packagereq type="default">gnu-efi</packagereq>
       <packagereq type="default">grub</packagereq>
+      <packagereq type="default">mdadm</packagereq>
       <packagereq type="default">sysfsutils</packagereq>
       <packagereq type="default">udftools</packagereq>
       <packagereq type="mandatory">authconfig</packagereq>
@@ -2087,6 +2083,8 @@
       <packagereq type="mandatory">libhugetlbfs</packagereq>
       <packagereq type="mandatory">libtermcap</packagereq>
       <packagereq type="mandatory">mkinitrd</packagereq>
+      <packagereq type="default">openssh-clients</packagereq>
+      <packagereq type="mandatory">openssh-server</packagereq>
       <packagereq type="mandatory">passwd</packagereq>
       <packagereq type="mandatory">policycoreutils</packagereq>
       <packagereq type="mandatory">prelink</packagereq>
@@ -2094,7 +2092,7 @@
       <packagereq type="mandatory">readline</packagereq>
       <packagereq type="mandatory">redhat-logos</packagereq>
       <packagereq type="mandatory">centos-release</packagereq>
-      <packagereq type="mandatory">openssh-server</packagereq>
+      <packagereq type="mandatory">centos-release-notes</packagereq>
       <packagereq type="mandatory">rootfiles</packagereq>
       <packagereq type="mandatory">rpm</packagereq>
       <packagereq type="mandatory">selinux-policy-targeted</packagereq>
@@ -2104,13 +2102,12 @@
       <packagereq type="mandatory">shadow-utils</packagereq>
       <packagereq type="mandatory">sysklogd</packagereq>
       <packagereq type="mandatory">SysVinit</packagereq>
-	          <packagereq type="mandatory">SysVinit</packagereq>
       <packagereq type="mandatory">termcap</packagereq>
       <packagereq type="mandatory">util-linux</packagereq>
       <packagereq type="mandatory">vim-minimal</packagereq>
       <packagereq type="mandatory">yum</packagereq>
-      <packagereq type="optional">ecryptfs-utils</packagereq>
-      <packagereq type="optional">rsyslog</packagereq>
+      <packagereq type="default">ecryptfs-utils</packagereq>
+      <packagereq type="default">rsyslog</packagereq>
       <packagereq type="optional">sgpio</packagereq>
    </packagelist>
   </group>
diff --git a/c5-x86_64-comps.xml b/c5-x86_64-comps.xml
index ca8436c..a64d5ae 100644
--- a/c5-x86_64-comps.xml
+++ b/c5-x86_64-comps.xml
@@ -746,8 +746,6 @@
       <packagereq type="default">cpuspeed</packagereq>
       <packagereq type="default">crash</packagereq>
       <packagereq type="default">cryptsetup-luks</packagereq>
-      <packagereq type="default">dhclient</packagereq>
-      <packagereq type="default">dhcpv6-client</packagereq>
       <packagereq type="default">dmraid</packagereq>
       <packagereq type="default">dos2unix</packagereq>
       <packagereq type="default">dosfstools</packagereq>
@@ -766,7 +764,6 @@
       <packagereq type="default">jwhois</packagereq>
       <packagereq type="default">krb5-workstation</packagereq>
       <packagereq type="default">ksh</packagereq>
-	          <packagereq type="default">ksh</packagereq>
       <packagereq type="default">lftp</packagereq>
       <packagereq type="default">libaio</packagereq>
       <packagereq type="default">logwatch</packagereq>
@@ -774,7 +771,6 @@
       <packagereq type="default">man-pages-overrides</packagereq>
       <packagereq type="default">man-pages</packagereq>
       <packagereq type="default">mcelog</packagereq>
-      <packagereq type="default">mdadm</packagereq>
       <packagereq type="default">mgetty</packagereq>
       <packagereq type="default">microcode_ctl</packagereq>
       <packagereq type="default">mkbootdisk</packagereq>
@@ -2057,8 +2053,11 @@
    <default>true</default>
    <uservisible>false</uservisible>
    <packagelist>
-         <packagereq type="default">Deployment_Guide-en-US</packagereq>
+      <packagereq type="optional">Deployment_Guide-en-US</packagereq>
+      <packagereq type="default">dhclient</packagereq>
+      <packagereq type="default">dhcpv6-client</packagereq>
       <packagereq type="default">grub</packagereq>
+      <packagereq type="default">mdadm</packagereq>
       <packagereq type="default">sysfsutils</packagereq>
       <packagereq type="default">udftools</packagereq>
       <packagereq type="mandatory">authconfig</packagereq>
@@ -2082,6 +2081,7 @@
       <packagereq type="mandatory">libhugetlbfs</packagereq>
       <packagereq type="mandatory">libtermcap</packagereq>
       <packagereq type="mandatory">mkinitrd</packagereq>
+      <packagereq type="default">openssh-clients</packagereq>
       <packagereq type="mandatory">openssh-server</packagereq>
       <packagereq type="mandatory">passwd</packagereq>
       <packagereq type="mandatory">policycoreutils</packagereq>
@@ -2090,6 +2090,7 @@
       <packagereq type="mandatory">readline</packagereq>
       <packagereq type="mandatory">redhat-logos</packagereq>
       <packagereq type="mandatory">centos-release</packagereq>
+      <packagereq type="mandatory">centos-release-notes</packagereq>
       <packagereq type="mandatory">rootfiles</packagereq>
       <packagereq type="mandatory">rpm</packagereq>
       <packagereq type="mandatory">selinux-policy-targeted</packagereq>
@@ -2099,13 +2100,12 @@
       <packagereq type="mandatory">shadow-utils</packagereq>
       <packagereq type="mandatory">sysklogd</packagereq>
       <packagereq type="mandatory">SysVinit</packagereq>
-	          <packagereq type="mandatory">SysVinit</packagereq>
       <packagereq type="mandatory">termcap</packagereq>
       <packagereq type="mandatory">util-linux</packagereq>
       <packagereq type="mandatory">vim-minimal</packagereq>
       <packagereq type="mandatory">yum</packagereq>
-      <packagereq type="optional">ecryptfs-utils</packagereq>
-      <packagereq type="optional">rsyslog</packagereq>
+      <packagereq type="default">ecryptfs-utils</packagereq>
+      <packagereq type="default">rsyslog</packagereq>
       <packagereq type="optional">sgpio</packagereq>
    </packagelist>
   </group>