diff --git a/classes/obmc-phosphor-image.bbclass b/classes/obmc-phosphor-image.bbclass
index 5961839..f34b1a6 100644
--- a/classes/obmc-phosphor-image.bbclass
+++ b/classes/obmc-phosphor-image.bbclass
@@ -12,6 +12,7 @@
 # - obmc-fan-control                  - OpenBMC fan management
 # - obmc-fan-mgmt                     - Deprecated - use obmc-fan-control instead
 # - obmc-flash-mgmt                   - OpenBMC flash management
+# - obmc-health-monitor               - OpenBMC health monitoring
 # - obmc-host-ctl                     - OpenBMC host control
 # - obmc-host-ipmi                    - OpenBMC host IPMI
 # - obmc-host-state-mgmt              - OpenBMC host state management
@@ -41,6 +42,7 @@
 FEATURE_PACKAGES_obmc-fan-control ?= "packagegroup-obmc-apps-fan-control"
 FEATURE_PACKAGES_obmc-fan-mgmt ?= "${@bb.utils.contains('COMBINED_FEATURES', 'obmc-phosphor-fan-mgmt', 'virtual-obmc-fan-mgmt', '', d)}"
 FEATURE_PACKAGES_obmc-flash-mgmt ?= "${@bb.utils.contains('COMBINED_FEATURES', 'obmc-phosphor-flash-mgmt', 'virtual-obmc-flash-mgmt', '', d)}"
+FEATURE_PACKAGES_obmc-health-monitor ?= "packagegroup-obmc-apps-health-monitor"
 FEATURE_PACKAGES_obmc-host-ctl ?= "${@bb.utils.contains('COMBINED_FEATURES', 'obmc-host-ctl', 'virtual-obmc-host-ctl', '', d)}"
 FEATURE_PACKAGES_obmc-host-ipmi ?= "${@bb.utils.contains('COMBINED_FEATURES', 'obmc-host-ipmi', 'virtual-obmc-host-ipmi-hw', '', d)}"
 FEATURE_PACKAGES_obmc-host-state-mgmt ?= "packagegroup-obmc-apps-host-state-mgmt"
diff --git a/recipes-phosphor/images/obmc-phosphor-image.bb b/recipes-phosphor/images/obmc-phosphor-image.bb
index c7512ed..ea87fb1 100644
--- a/recipes-phosphor/images/obmc-phosphor-image.bb
+++ b/recipes-phosphor/images/obmc-phosphor-image.bb
@@ -15,6 +15,7 @@
         obmc-fan-control \
         obmc-fan-mgmt \
         obmc-flash-mgmt \
+        obmc-health-monitor \
         obmc-host-ctl \
         obmc-host-ipmi \
         obmc-host-state-mgmt \
diff --git a/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index deeae79..78949f7 100644
--- a/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -13,6 +13,7 @@
         ${PN}-extras \
         ${PN}-devtools \
         ${PN}-fan-control \
+        ${PN}-health-monitor \
         ${PN}-host-state-mgmt \
         ${PN}-ikvm \
         ${PN}-inventory \
@@ -82,6 +83,11 @@
         phosphor-fan-monitor \
         "
 
+SUMMARY_${PN}-health-monitor = "Support for health monitoring"
+RDEPENDS_${PN}-health-monitor = " \
+        phosphor-health-monitor \
+        "
+
 SUMMARY_${PN}-host-state-mgmt = "Host state management"
 RDEPENDS_${PN}-host-state-mgmt = " \
         ${VIRTUAL-RUNTIME_obmc-host-state-manager} \