diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index a88d36f5..d55e2ca7 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -1026,7 +1026,6 @@
       <packagereq type="default">ntfs-3g</packagereq>
       <packagereq type="default">ntfsprogs</packagereq>
       <packagereq type="default">numactl</packagereq>
-      <packagereq type="default">openssh-clients</packagereq>
       <packagereq type="default">PackageKit-yum-plugin</packagereq>
       <packagereq type="default">pam_krb5</packagereq>
       <packagereq type="default">pam_pkcs11</packagereq>
@@ -1378,6 +1377,7 @@
       <packagereq type="mandatory">iputils</packagereq>
       <packagereq type="mandatory">kbd</packagereq>
       <packagereq type="mandatory">ncurses</packagereq>
+      <packagereq type="mandatory">openssh-clients</packagereq>
       <packagereq type="mandatory">openssh-server</packagereq>
       <packagereq type="mandatory">parted</packagereq>
       <packagereq type="mandatory">passwd</packagereq>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index a88d36f5..d55e2ca7 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -1026,7 +1026,6 @@
       <packagereq type="default">ntfs-3g</packagereq>
       <packagereq type="default">ntfsprogs</packagereq>
       <packagereq type="default">numactl</packagereq>
-      <packagereq type="default">openssh-clients</packagereq>
       <packagereq type="default">PackageKit-yum-plugin</packagereq>
       <packagereq type="default">pam_krb5</packagereq>
       <packagereq type="default">pam_pkcs11</packagereq>
@@ -1378,6 +1377,7 @@
       <packagereq type="mandatory">iputils</packagereq>
       <packagereq type="mandatory">kbd</packagereq>
       <packagereq type="mandatory">ncurses</packagereq>
+      <packagereq type="mandatory">openssh-clients</packagereq>
       <packagereq type="mandatory">openssh-server</packagereq>
       <packagereq type="mandatory">parted</packagereq>
       <packagereq type="mandatory">passwd</packagereq>