diff --git a/c5-i386-comps.xml b/c5-i386-comps.xml
index 262f696..b00c01c 100644
--- a/c5-i386-comps.xml
+++ b/c5-i386-comps.xml
@@ -793,7 +793,6 @@
       <packagereq type="default">oddjob</packagereq>
       <packagereq type="default">OpenIPMI</packagereq>
       <packagereq type="default">openssh-clients</packagereq>
-      <packagereq type="default">openssh-server</packagereq>
       <packagereq type="default">pam_ccreds</packagereq>
       <packagereq type="default">pam_krb5</packagereq>
       <packagereq type="default">pam_passwdqc</packagereq>
@@ -842,7 +841,6 @@
       <packagereq type="default">wireless-tools</packagereq>
       <packagereq type="default">words</packagereq>
       <packagereq type="default">ypbind</packagereq>
-      <packagereq type="default">yum</packagereq>
       <packagereq type="default">yum-rhn-plugin</packagereq>
       <packagereq type="default">yum-security</packagereq>
       <packagereq type="default">yum-updatesd</packagereq>
@@ -2096,6 +2094,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">rootfiles</packagereq>
       <packagereq type="mandatory">rpm</packagereq>
       <packagereq type="mandatory">selinux-policy-targeted</packagereq>
@@ -2109,6 +2108,7 @@
       <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="optional">sgpio</packagereq>
diff --git a/c5-x86_64-comps.xml b/c5-x86_64-comps.xml
index f25b8cc..3a2a92f 100644
--- a/c5-x86_64-comps.xml
+++ b/c5-x86_64-comps.xml
@@ -793,7 +793,6 @@
       <packagereq type="default">oddjob</packagereq>
       <packagereq type="default">OpenIPMI</packagereq>
       <packagereq type="default">openssh-clients</packagereq>
-      <packagereq type="default">openssh-server</packagereq>
       <packagereq type="default">pam_ccreds</packagereq>
       <packagereq type="default">pam_krb5</packagereq>
       <packagereq type="default">pam_passwdqc</packagereq>
@@ -842,7 +841,6 @@
       <packagereq type="default">wireless-tools</packagereq>
       <packagereq type="default">words</packagereq>
       <packagereq type="default">ypbind</packagereq>
-      <packagereq type="default">yum</packagereq>
       <packagereq type="default">yum-rhn-plugin</packagereq>
       <packagereq type="default">yum-security</packagereq>
       <packagereq type="default">yum-updatesd</packagereq>
@@ -2084,6 +2082,7 @@
       <packagereq type="mandatory">libhugetlbfs</packagereq>
       <packagereq type="mandatory">libtermcap</packagereq>
       <packagereq type="mandatory">mkinitrd</packagereq>
+      <packagereq type="mandatory">openssh-server</packagereq>
       <packagereq type="mandatory">passwd</packagereq>
       <packagereq type="mandatory">policycoreutils</packagereq>
       <packagereq type="mandatory">prelink</packagereq>
@@ -2104,6 +2103,7 @@
       <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="optional">sgpio</packagereq>