diff --git a/classes/obmc-phosphor-image.bbclass b/classes/obmc-phosphor-image.bbclass
index d993bb1..32b7317 100644
--- a/classes/obmc-phosphor-image.bbclass
+++ b/classes/obmc-phosphor-image.bbclass
@@ -31,6 +31,7 @@
 FEATURE_PACKAGES_obmc-host-ipmi ?= "${@cf_enabled('obmc-host-ipmi', 'virtual-obmc-host-ipmi-hw', d)}"
 FEATURE_PACKAGES_obmc-host-state-mgmt ?= "${@cf_enabled('obmc-host-state-mgmt', 'virtual-obmc-host-state-mgmt', d)}"
 FEATURE_PACKAGES_obmc-logging-mgmt ?= "${@df_enabled('obmc-logging-mgmt', 'virtual-obmc-logging-mgmt', d)}"
+FEATURE_PACKAGES_obmc-net-ipmi ?= "${@df_enabled('obmc-net-ipmi', 'virtual-obmc-net-ipmi', d)}"
 FEATURE_PACKAGES_obmc-sensor-mgmt ?= "${@cf_enabled('obmc-phosphor-sensor-mgmt', 'virtual-obmc-sensor-mgmt', d)}"
 FEATURE_PACKAGES_obmc-settings-mgmt ?= "${@df_enabled('obmc-settings-mgmt', 'virtual-obmc-settings-mgmt', d)}"
 FEATURE_PACKAGES_obmc-system-mgmt ?= "${@df_enabled('obmc-phosphor-system-mgmt', 'virtual-obmc-system-mgmt', d)}"
@@ -48,6 +49,7 @@
         obmc-host-ipmi \
         obmc-host-state-mgmt \
         obmc-logging-mgmt \
+        obmc-net-ipmi \
         obmc-sensor-mgmt \
         obmc-settings-mgmt \
         obmc-system-mgmt \
diff --git a/common/recipes-phosphor/net-ipmid/phosphor-net-ipmid.bb b/common/recipes-phosphor/net-ipmid/phosphor-net-ipmid.bb
new file mode 100644
index 0000000..7331957
--- /dev/null
+++ b/common/recipes-phosphor/net-ipmid/phosphor-net-ipmid.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Phosphor Network IPMI Daemon"
+DESCRIPTION = "Daemon to support IPMI protocol over network"
+HOMEPAGE = "https://github.com/openbmc/phosphor-net-ipmid"
+PR = "r1"
+
+inherit autotools pkgconfig
+inherit obmc-phosphor-license
+inherit obmc-phosphor-systemd
+
+DEPENDS += "autoconf-archive-native"
+DEPENDS += "phosphor-mapper"
+DEPENDS += "systemd"
+DEPENDS += "phosphor-ipmi-host"
+RDEPENDS_${PN} += "libmapper"
+RDEPENDS_${PN} += "libsystemd"
+PROVIDES += "virtual/obmc-net-ipmi"
+RPROVIDES_${PN} += "virtual-obmc-net-ipmi"
+
+SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid"
+SRCREV = "f744494864ef9292f8746922a5bf4bbe164d6430"
+
+S = "${WORKDIR}/git"
+
+SYSTEMD_SERVICE_${PN} = "${PN}.service"
diff --git a/common/recipes-phosphor/net-ipmid/phosphor-net-ipmid/phosphor-net-ipmid.service b/common/recipes-phosphor/net-ipmid/phosphor-net-ipmid/phosphor-net-ipmid.service
new file mode 100644
index 0000000..5a2ecbd
--- /dev/null
+++ b/common/recipes-phosphor/net-ipmid/phosphor-net-ipmid/phosphor-net-ipmid.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Network IPMI daemon
+
+[Service]
+ExecStart={sbindir}/netipmid
+Restart=always
+
+[Install]
+WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/conf/distro/include/phosphor-defaults.inc b/conf/distro/include/phosphor-defaults.inc
index 54b98bc..1740c7e 100644
--- a/conf/distro/include/phosphor-defaults.inc
+++ b/conf/distro/include/phosphor-defaults.inc
@@ -17,6 +17,7 @@
 PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-hw-example"
 PREFERRED_PROVIDER_virtual/obmc-host-state-mgmt ?= "phosphor-state-manager"
 PREFERRED_PROVIDER_virtual/obmc-logging-mgmt ?= "phosphor-logging"
+PREFERRED_PROVIDER_virtual/obmc-net-ipmi ?= "phosphor-net-ipmid"
 PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt ?= "obmc-phosphor-sensord"
 PREFERRED_PROVIDER_virtual/obmc-settings-mgmt ?= "phosphor-settings"
 PREFERRED_PROVIDER_virtual/obmc-system-mgmt ?= "obmc-phosphor-sysd"
diff --git a/conf/distro/openbmc-phosphor.conf b/conf/distro/openbmc-phosphor.conf
index b177b9e..f18caf7 100644
--- a/conf/distro/openbmc-phosphor.conf
+++ b/conf/distro/openbmc-phosphor.conf
@@ -37,6 +37,7 @@
         obmc-host-state-mgmt \
         obmc-chassis-state-mgmt \
         obmc-bmc-state-mgmt \
+        obmc-net-ipmi \
         ${DISTRO_FEATURES_LIBC} \
         "