diff --git a/config/comps.xml b/config/comps.xml
index 42a10a8f..6ff65be2 100644
--- a/config/comps.xml
+++ b/config/comps.xml
@@ -10,16 +10,21 @@
     <packagelist>
       <packagereq type="optional">anaconda-runtime</packagereq>
       <packagereq type="mandatory">authconfig</packagereq>
-      <packagereq type="optional">busybox</packagereq>
+      <packagereq type="optional">busybox-anaconda</packagereq>
       <packagereq type="optional">dejavu-lgc-fonts</packagereq>
+      <packagereq type="optional">firstboot</packagereq>
       <packagereq type="optional">gnome-python2-gtkhtml2</packagereq>
       <packagereq type="default">grub</packagereq>
+      <packagereq type="default">joe</packagereq>
       <packagereq type="optional">kernel</packagereq>
       <packagereq type="optional">kernel-xen</packagereq>
       <packagereq type="optional">libuser</packagereq>
+      <packagereq type="optional">man</packagereq>
+      <packagereq type="optional">memtest86+</packagereq>
       <packagereq type="optional">policycoreutils</packagereq>
       <packagereq type="optional">selinux-policy</packagereq>
       <packagereq type="optional">selinux-policy-targeted</packagereq>
+      <packagereq type="optional">system-config-keyboard</packagereq>
       <packagereq type="optional">xen</packagereq>
       <packagereq type="optional">xorg-x11-drivers</packagereq>
       <packagereq type="optional">xorg-x11-fonts-base</packagereq>