diff --git a/classes/phosphor-dbus-yaml.bbclass b/classes/phosphor-dbus-yaml.bbclass
new file mode 100644
index 0000000..973c2bd
--- /dev/null
+++ b/classes/phosphor-dbus-yaml.bbclass
@@ -0,0 +1,4 @@
+yaml_dir = "${datadir}/phosphor-dbus-yaml/yaml"
+
+PACKAGE_BEFORE_PN += "${PN}-yaml"
+FILES_${PN}-yaml += "${yaml_dir}"
diff --git a/classes/phosphor-logging.bbclass b/classes/phosphor-logging.bbclass
index 0264b51..18f53d4 100644
--- a/classes/phosphor-logging.bbclass
+++ b/classes/phosphor-logging.bbclass
@@ -1,2 +1 @@
 callouts_datadir="${datadir}/phosphor-logging/callouts"
-error_yaml_dir = "${datadir}/phosphor-logging/error/yaml"