diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
index 80c16d2..4143f34 100644
--- a/meta-phosphor/classes/obmc-phosphor-image.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass
@@ -72,6 +72,11 @@
 # tree under phosphor-ipmi-host
 FEATURE_PACKAGES_obmc-net-ipmi:qemuall = ""
 
+# EVB systems do not have a managed system.
+FEATURE_PACKAGES_obmc-system-mgmt:phosphor-evb = ""
+# QEMU systems are like EVBs and do not have a managed system.
+FEATURE_PACKAGES_obmc-system-mgmt:qemuall = ""
+
 # Add new packages to be installed to a package group in
 # packagegroup-obmc-apps, not here.
 OBMC_IMAGE_BASE_INSTALL = " \
diff --git a/meta-phosphor/conf/machine/include/obmc-evb-common.inc b/meta-phosphor/conf/machine/include/obmc-evb-common.inc
index 34d5250..0d41a1b 100644
--- a/meta-phosphor/conf/machine/include/obmc-evb-common.inc
+++ b/meta-phosphor/conf/machine/include/obmc-evb-common.inc
@@ -1,2 +1,4 @@
-# EVBs don't have a managed system, so remove the feature.
-IMAGE_FEATURES:remove = "obmc-system-mgmt"
+# EVB systems have different packages they can support, due to not having a
+# managed host.  Enable this machine override to allow other recipes to know
+# that the machine is a special type.
+MACHINEOVERRIDES =. "phosphor-evb:"