diff --git a/comps-f16.xml.in b/comps-f16.xml.in
index a23be66f..2076f11b 100644
--- a/comps-f16.xml.in
+++ b/comps-f16.xml.in
@@ -12,7 +12,6 @@
gnome-disk-utility
gnome-packagekit
setroubleshoot
- system-config-boot
system-config-date
system-config-firewall
system-config-keyboard
@@ -32,6 +31,7 @@
ntop
pessulus
qtparted
+ system-config-boot
system-config-kickstart
system-config-lvm
system-config-network
diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index 1a285732..722ea83c 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -12,7 +12,6 @@
gnome-disk-utility
gnome-packagekit
setroubleshoot
- system-config-boot
system-config-date
system-config-firewall
system-config-keyboard
@@ -32,6 +31,7 @@
ntop
pessulus
qtparted
+ system-config-boot
system-config-kickstart
system-config-lvm
system-config-network