diff --git a/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service b/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
new file mode 100644
index 0000000..e3034e3
--- /dev/null
+++ b/common/recipes-phosphor/state/files/xyz.openbmc_project.State.BMC.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Phosphor BMC State Manager
+Wants=mapper-wait@-org-openbmc-managers-System.service
+After=mapper-wait@-org-openbmc-managers-System.service
+Before=mapper-wait@-xyz-openbmc_project-state-bmc.service
+
+[Service]
+ExecStart={sbindir}/phosphor-bmc-state-manager
+Restart=always
+Type=dbus
+BusName={BUSNAME}
+
+[Install]
+WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/common/recipes-phosphor/state/phosphor-state-manager.bb b/common/recipes-phosphor/state/phosphor-state-manager.bb
index 176c42b..390ad49 100644
--- a/common/recipes-phosphor/state/phosphor-state-manager.bb
+++ b/common/recipes-phosphor/state/phosphor-state-manager.bb
@@ -10,6 +10,7 @@
 STATE_MGR_PACKAGES = " \
     ${PN}-host \
     ${PN}-chassis \
+    ${PN}-bmc \
 "
 PACKAGES =+ "${STATE_MGR_PACKAGES}"
 DBUS_PACKAGES = "${STATE_MGR_PACKAGES}"
@@ -27,6 +28,7 @@
 
 RDEPENDS_${PN}-host += "libsystemd"
 RDEPENDS_${PN}-chassis += "libsystemd"
+RDEPENDS_${PN}-bmc += "libsystemd"
 
 PROVIDES += "virtual/obmc-host-state-mgmt"
 RPROVIDES_${PN}-host += "virtual-obmc-host-state-mgmt"
@@ -38,6 +40,11 @@
 FILES_${PN}-chassis = "${sbindir}/phosphor-chassis-state-manager"
 DBUS_SERVICE_${PN}-chassis += "xyz.openbmc_project.State.Chassis.service"
 
+PROVIDES += "virtual/obmc-bmc-state-mgmt"
+RPROVIDES_${PN}-bmc += "virtual-obmc-bmc-state-mgmt"
+FILES_${PN}-bmc = "${sbindir}/phosphor-bmc-state-manager"
+DBUS_SERVICE_${PN}-bmc += "xyz.openbmc_project.State.BMC.service"
+
 SRC_URI += "git://github.com/openbmc/phosphor-state-manager"
 SRCREV = "d613b8166a3c3dc652badf8d8c52e74492941f28"