diff --git a/conf/distro/include/phosphor-base.inc b/conf/distro/include/phosphor-base.inc
index 297b2d3..4da31b7 100644
--- a/conf/distro/include/phosphor-base.inc
+++ b/conf/distro/include/phosphor-base.inc
@@ -143,3 +143,9 @@
 LAYER_CONF_VERSION ?= "8"
 
 KERNEL_CLASSES_append = " obmc-phosphor-kernel-version"
+
+# Some packages have directory trees of YAML files arranged based on
+# canonical organization names.  'xyz/openbmc_project' should be used
+# everywhere in phosphor, but some layers may append this with their
+# own organization(s).
+OBMC_ORG_YAML_SUBDIRS += " xyz/openbmc_project"