diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
index a6c012a..f164583 100644
--- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
+++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
@@ -7,6 +7,7 @@
         obmc-host-ctl \
         openpower-pflash \
         obmc-host-state-mgmt \
+        obmc-chassis-state-mgmt \
         "
 
 VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
index 62b1c5f..3dbefa2 100644
--- a/meta-phosphor/classes/obmc-phosphor-image.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass
@@ -13,6 +13,7 @@
 # - obmc-host-ipmi                    - OpenBMC Host IPMI
 # - obmc-logging                      - OpenBMC logging management
 # - obmc-host-state-mgmt              - OpenBMC Host State Management
+# - obmc-chassis-state-mgmt           - OpenBMC Chassis State Management
 
 inherit core-image
 inherit obmc-phosphor-license
@@ -30,6 +31,7 @@
 FEATURE_PACKAGES_obmc-logging-mgmt ?= "${@df_enabled('obmc-logging-mgmt', 'virtual-obmc-logging-mgmt', d)}"
 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)}"
 
 # Install entire Phosphor application stack by default
 IMAGE_FEATURES += " \
@@ -46,6 +48,7 @@
         obmc-host-ctl \
         ssh-server-dropbear \
         obmc-host-state-mgmt \
+        obmc-chassis-state-mgmt \
         "
 
 CORE_IMAGE_EXTRA_INSTALL_append = " bash \
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index 267e382..aae0cdb 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -20,3 +20,4 @@
 PREFERRED_PROVIDER_virtual/obmc-settings-mgmt ?= "phosphor-settings"
 PREFERRED_PROVIDER_virtual/obmc-logging-mgmt ?= "phosphor-logging"
 PREFERRED_PROVIDER_virtual/obmc-host-state-mgmt ?= "phosphor-host-state-manager"
+PREFERRED_PROVIDER_virtual/obmc-chassis-state-mgmt ?= "phosphor-chassis-state-manager"
diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf
index bc0f955..2d8f6a3 100644
--- a/meta-phosphor/conf/distro/openbmc-phosphor.conf
+++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf
@@ -35,6 +35,7 @@
         avahi \
         slp \
         obmc-host-state-mgmt \
+        obmc-chassis-state-mgmt \
         ${DISTRO_FEATURES_LIBC} \
         "