diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc
index 0e7e849..64f293c 100644
--- a/meta-phosphor/conf/distro/include/phosphor-base.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-base.inc
@@ -91,6 +91,7 @@
         obmc-phosphor-chassis-mgmt \
         obmc-phosphor-fan-mgmt \
         obmc-phosphor-flash-mgmt \
+        obmc-phosphor-system-mgmt \
         "
 
 DISTRO_FEATURES_DEFAULT = " \
diff --git a/meta-phosphor/conf/machine/include/obmc-evb-common.inc b/meta-phosphor/conf/machine/include/obmc-evb-common.inc
new file mode 100644
index 0000000..34d5250
--- /dev/null
+++ b/meta-phosphor/conf/machine/include/obmc-evb-common.inc
@@ -0,0 +1,2 @@
+# EVBs don't have a managed system, so remove the feature.
+IMAGE_FEATURES:remove = "obmc-system-mgmt"