diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index c581cffd..5b5a6127 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -13,7 +13,6 @@
       <packagereq type="default">gnome-packagekit</packagereq>
       <packagereq type="default">setroubleshoot</packagereq>
       <packagereq type="default">system-config-date</packagereq>
-      <packagereq type="default">system-config-firewall</packagereq>
       <packagereq type="default">system-config-keyboard</packagereq>
       <packagereq type="default">system-config-language</packagereq>
       <packagereq type="default">system-config-users</packagereq>
@@ -32,6 +31,7 @@
       <packagereq type="optional">pessulus</packagereq>
       <packagereq type="optional">qtparted</packagereq>
       <packagereq type="optional">system-config-boot</packagereq>
+      <packagereq type="optional">system-config-firewall</packagereq>
       <packagereq type="optional">system-config-kickstart</packagereq>
       <packagereq type="optional">system-config-lvm</packagereq>
       <packagereq type="optional">system-config-network</packagereq>
@@ -216,6 +216,7 @@
       <packagereq type="mandatory">cyrus-sasl-plain</packagereq>
       <packagereq type="mandatory">dbus</packagereq>
       <packagereq type="mandatory">ed</packagereq>
+      <packagereq type="mandatory">firewalld</packagereq>
       <packagereq type="mandatory">logrotate</packagereq>
       <packagereq type="mandatory">lsof</packagereq>
       <packagereq type="mandatory">mailcap</packagereq>
@@ -289,7 +290,6 @@
       <packagereq type="default">stunnel</packagereq>
       <packagereq type="default">sudo</packagereq>
       <packagereq type="default">symlinks</packagereq>
-      <packagereq type="default">system-config-firewall-tui</packagereq>
       <packagereq type="default">system-config-network-tui</packagereq>
       <packagereq type="default">talk</packagereq>
       <packagereq type="default">tcpdump</packagereq>
@@ -707,7 +707,6 @@
       <packagereq type="mandatory">initscripts</packagereq>
       <packagereq type="mandatory">iproute</packagereq>
       <packagereq type="mandatory">iprutils</packagereq>
-      <packagereq type="mandatory">iptables</packagereq>
       <packagereq type="mandatory">iputils</packagereq>
       <packagereq type="mandatory">kbd</packagereq>
       <packagereq type="mandatory">libgcc</packagereq>
@@ -2770,7 +2769,6 @@
       <packagereq type="default">shotwell</packagereq>
       <packagereq type="default">simple-scan</packagereq>
       <packagereq type="default">sushi</packagereq>
-      <packagereq type="default">system-config-firewall</packagereq>
       <packagereq type="default">vinagre</packagereq>
       <packagereq type="default">vino</packagereq>
       <packagereq type="default">xdg-user-dirs-gtk</packagereq>
@@ -3810,7 +3808,6 @@
       <packagereq type="default">scribus</packagereq>
       <packagereq type="default">svnpart</packagereq>
       <packagereq type="default">system-config-date</packagereq>
-      <packagereq type="default">system-config-firewall</packagereq>
       <packagereq type="default">system-config-printer-kde</packagereq>
       <packagereq type="default">system-config-services</packagereq>
       <!-- See http://bugzilla.redhat.com/537609 on why xorg-x11-apps is here -->
diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index ff42cb32..b1eec8f9 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -13,7 +13,6 @@
       <packagereq type="default">gnome-packagekit</packagereq>
       <packagereq type="default">setroubleshoot</packagereq>
       <packagereq type="default">system-config-date</packagereq>
-      <packagereq type="default">system-config-firewall</packagereq>
       <packagereq type="default">system-config-keyboard</packagereq>
       <packagereq type="default">system-config-language</packagereq>
       <packagereq type="default">system-config-users</packagereq>
@@ -32,6 +31,7 @@
       <packagereq type="optional">pessulus</packagereq>
       <packagereq type="optional">qtparted</packagereq>
       <packagereq type="optional">system-config-boot</packagereq>
+      <packagereq type="optional">system-config-firewall</packagereq>
       <packagereq type="optional">system-config-kickstart</packagereq>
       <packagereq type="optional">system-config-lvm</packagereq>
       <packagereq type="optional">system-config-rootpassword</packagereq>
@@ -144,6 +144,7 @@
       <packagereq type="mandatory">cyrus-sasl-plain</packagereq>
       <packagereq type="mandatory">dbus</packagereq>
       <packagereq type="mandatory">ed</packagereq>
+      <packagereq type="mandatory">firewalld</packagereq>
       <packagereq type="mandatory">logrotate</packagereq>
       <packagereq type="mandatory">lsof</packagereq>
       <packagereq type="mandatory">mailcap</packagereq>
@@ -217,7 +218,6 @@
       <packagereq type="default">stunnel</packagereq>
       <packagereq type="default">sudo</packagereq>
       <packagereq type="default">symlinks</packagereq>
-      <packagereq type="default">system-config-firewall-tui</packagereq>
       <packagereq type="default">talk</packagereq>
       <packagereq type="default">tcpdump</packagereq>
       <packagereq type="default">tcp_wrappers</packagereq>
@@ -554,7 +554,6 @@
       <packagereq type="mandatory">initscripts</packagereq>
       <packagereq type="mandatory">iproute</packagereq>
       <packagereq type="mandatory">iprutils</packagereq>
-      <packagereq type="mandatory">iptables</packagereq>
       <packagereq type="mandatory">iputils</packagereq>
       <packagereq type="mandatory">kbd</packagereq>
       <packagereq type="mandatory">libgcc</packagereq>
@@ -2492,7 +2491,6 @@
       <packagereq type="default">shotwell</packagereq>
       <packagereq type="default">simple-scan</packagereq>
       <packagereq type="default">sushi</packagereq>
-      <packagereq type="default">system-config-firewall</packagereq>
       <packagereq type="default">vinagre</packagereq>
       <packagereq type="default">vino</packagereq>
       <packagereq type="default">xdg-user-dirs-gtk</packagereq>
@@ -3427,7 +3425,6 @@
       <packagereq type="default">scribus</packagereq>
       <packagereq type="default">svnpart</packagereq>
       <packagereq type="default">system-config-date</packagereq>
-      <packagereq type="default">system-config-firewall</packagereq>
       <packagereq type="default">system-config-printer-kde</packagereq>
       <packagereq type="default">system-config-services</packagereq>
       <!-- See http://bugzilla.redhat.com/537609 on why xorg-x11-apps is here -->