diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net/ipmi-net-firewall.sh b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net/ipmi-net-firewall.sh
new file mode 100644
index 0000000..ca32f98
--- /dev/null
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net/ipmi-net-firewall.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -f $IPTABLESRULE ]; then
+    iptables-restore < $IPTABLESRULE
+fi
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
index 2d61b90..6b836b6 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net/phosphor-ipmi-net.service
@@ -11,6 +11,8 @@
 After=mapper-wait@-xyz-openbmc_project-control-host0-restriction_mode.service
 
 [Service]
+Environment=IPTABLESRULE=/var/lib/iptables_rules
+ExecStartPre=/usr/bin/env ipmi-net-firewall.sh
 ExecStart=/usr/bin/env netipmid
 SyslogIdentifier=netipmid
 Restart=always
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
index c5984f1..27837fd 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
@@ -23,10 +23,16 @@
 GROUPADD_PARAM_${PN} = "ipmi"
 
 SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid"
+SRC_URI += "file://ipmi-net-firewall.sh"
 SRCREV = "5e452093830644245b83a817b8dad2fdb36ea550"
 
 S = "${WORKDIR}/git"
 
+do_install_append() {
+        install -m 0755 ${WORKDIR}/ipmi-net-firewall.sh \
+        ${D}${sbindir}/ipmi-net-firewall.sh
+}
+
 SYSTEMD_SERVICE_${PN} = " \
         ${PN}.service \
         ${PN}.socket \