diff --git a/classes/obmc-phosphor-image.bbclass b/classes/obmc-phosphor-image.bbclass
index 4082b9d..c2455b8 100644
--- a/classes/obmc-phosphor-image.bbclass
+++ b/classes/obmc-phosphor-image.bbclass
@@ -14,6 +14,7 @@
 # - obmc-logging                      - OpenBMC logging management
 # - obmc-host-state-mgmt              - OpenBMC Host State Management
 # - obmc-chassis-state-mgmt           - OpenBMC Chassis State Management
+# - obmc-bmc-state-mgmt               - OpenBMC BMC State Management
 
 inherit core-image
 inherit obmc-phosphor-license
@@ -32,6 +33,7 @@
 FEATURE_PACKAGES_obmc-host-ctl ?= "${@cf_enabled('obmc-host-ctl', 'virtual-obmc-host-ctl', d)}"
 FEATURE_PACKAGES_obmc-host-state-mgmt ?= "${@cf_enabled('obmc-host-state-mgmt', 'virtual-obmc-host-state-mgmt', d)}"
 FEATURE_PACKAGES_obmc-chassis-state-mgmt ?= "${@cf_enabled('obmc-chassis-state-mgmt', 'virtual-obmc-chassis-state-mgmt', d)}"
+FEATURE_PACKAGES_obmc-bmc-state-mgmt ?= "${@cf_enabled('obmc-bmc-state-mgmt', 'virtual-obmc-bmc-state-mgmt', d)}"
 
 # Install entire Phosphor application stack by default
 IMAGE_FEATURES += " \
@@ -49,6 +51,7 @@
         ssh-server-dropbear \
         obmc-host-state-mgmt \
         obmc-chassis-state-mgmt \
+        obmc-bmc-state-mgmt \
         "
 
 CORE_IMAGE_EXTRA_INSTALL_append = " bash \