diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb
new file mode 100644
index 0000000..f824835
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb
@@ -0,0 +1,37 @@
+SUMMARY = "OpenPower Software Management"
+DESCRIPTION = "OpenPower Software Manager provides a set of host software \
+management daemons. It is suitable for use on a wide variety of OpenPower \
+platforms."
+HOMEPAGE = "https://github.com/openbmc/openpower-pnor-code-mgmt"
+PR = "r1"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+
+inherit autotools pkgconfig
+inherit obmc-phosphor-dbus-service
+
+DEPENDS += " \
+        autoconf-archive-native \
+        phosphor-dbus-interfaces \
+        phosphor-logging \
+        sdbusplus \
+        "
+
+RDEPENDS_${PN} += " \
+        mtd-utils-ubifs \
+        phosphor-dbus-interfaces \
+        phosphor-logging \
+        sdbusplus \
+        "
+
+DBUS_SERVICE_${PN} += "org.open_power.Software.Host.Updater.service"
+SYSTEMD_SERVICE_${PN} += " \
+        obmc-flash-bios-ubiattach.service \
+        obmc-flash-bios-ubimount@.service \
+        obmc-flash-bios-squashfsmount@.service \
+        "
+
+SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt"
+SRCREV = "1e9b7163913b1e64766a4263bc47e6cff5af3120"
+
+S = "${WORKDIR}/git"
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-squashfsmount@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-squashfsmount@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-squashfsmount@.service
rename to meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-squashfsmount@.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubiattach.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiattach.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubiattach.service
rename to meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiattach.service
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubimount@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubimount@.service
similarity index 100%
rename from meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios/obmc-flash-bios-ubimount@.service
rename to meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubimount@.service
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/org.open_power.Software.Host.Updater.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/org.open_power.Software.Host.Updater.service
new file mode 100644
index 0000000..d0519da
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/org.open_power.Software.Host.Updater.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=OpenPower Software Update Manager
+Wants=xyz.openbmc_project.Software.Version.service
+Before=xyz.openbmc_project.Software.Version.service
+
+[Service]
+ExecStart={sbindir}/openpower-update-manager
+Restart=always
+Type=dbus
+BusName={BUSNAME}
+
+[Install]
+WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
index b4ff9ab..8e69012 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
@@ -52,6 +52,7 @@
         obmc-mgr-download \
         obmc-op-flasher \
         obmc-control-bmc \
+        openpower-software-manager \
         "
 
 SUMMARY_${PN}-system = "OpenPOWER System"
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb
index 2137de4..c425027 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-flash-bios.bb
@@ -7,11 +7,6 @@
 inherit skeleton-gdbus
 inherit obmc-phosphor-dbus-service
 
-RDEPENDS_${PN} += "mtd-utils-ubifs"
-
 SKELETON_DIR = "flashbios"
 DBUS_SERVICE_${PN} += "org.openbmc.control.Flash.service"
 SYSTEMD_SERVICE_${PN} += "obmc-flash-init.service"
-SYSTEMD_SERVICE_${PN} += "obmc-flash-bios-ubiattach.service"
-SYSTEMD_SERVICE_${PN} += "obmc-flash-bios-ubimount@.service"
-SYSTEMD_SERVICE_${PN} += "obmc-flash-bios-squashfsmount@.service"