diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index feab40b5..89808226 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -13,6 +13,7 @@
gnome-packagekit
setroubleshoot
system-config-date
+ system-config-firewall
system-config-keyboard
system-config-language
system-config-users
@@ -31,7 +32,6 @@
pessulus
qtparted
system-config-boot
- system-config-firewall
system-config-kickstart
system-config-lvm
system-config-network
@@ -216,7 +216,6 @@
cyrus-sasl-plain
dbus
ed
- firewalld
logrotate
lsof
mailcap
@@ -289,6 +288,7 @@
stunnel
sudo
symlinks
+ system-config-firewall-tui
system-config-network-tui
talk
tcpdump
@@ -706,6 +706,7 @@
initscripts
iproute
iprutils
+ iptables
iputils
kbd
libgcc
@@ -2771,6 +2772,7 @@
shotwell
simple-scan
sushi
+ system-config-firewall
vinagre
vino
xdg-user-dirs-gtk
@@ -3775,6 +3777,7 @@
scribus
svnpart
system-config-date
+ system-config-firewall
system-config-printer-kde
system-config-services