diff --git a/files/rpms/general b/files/rpms/general
index 7b2c00ad5c..43101f7c87 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -28,3 +28,4 @@ net-tools
 java-1.7.0-openjdk-headless  # NOPRIME rhel7,f20
 java-1.8.0-openjdk-headless  # NOPRIME f21,f22
 pyOpenSSL # version in pip uses too much memory
+iptables-services  # NOPRIME f21,f22
diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh
index 31258d13f7..4fff57f401 100755
--- a/tools/fixup_stuff.sh
+++ b/tools/fixup_stuff.sh
@@ -126,6 +126,9 @@ if is_fedora; then
         # [4] http://docs.openstack.org/developer/devstack/guides/neutron.html
         if is_package_installed firewalld; then
             sudo systemctl disable firewalld
+            # The iptables service files are no longer included by default,
+            # at least on a baremetal Fedora 21 Server install.
+            install_package iptables-services
             sudo systemctl enable iptables
             sudo systemctl stop firewalld
             sudo systemctl start iptables