diff --git a/configure.ac b/configure.ac
index 9d57adc..a2bfc73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,15 @@
 AC_ARG_ENABLE([libphosphor_dbus],
     AS_HELP_STRING([--disable-libphosphor_dbus], [Disable libphosphor_dbus]))
 
+YAML_DIRS="xyz"
+
+AC_ARG_ENABLE([openpower_dbus_interfaces],
+    AS_HELP_STRING([--enable-openpower-dbus-interfaces], [Enable the OpenPower D-Bus interfaces]))
+
+AS_IF([test "x$enable_openpower_dbus_interfaces" == "xyes"], [
+       YAML_DIRS="$YAML_DIRS org/open_power"
+])
+
 AM_CONDITIONAL([WANT_LIBPHOSPHOR_DBUS], [test "x$enable_libphosphor_dbus" != "xno"])
 
 AS_IF([test "x$enable_libphosphor_dbus" != "xno"], [
@@ -48,11 +57,13 @@
 
     # Create configured output
     AC_CONFIG_FILES([Makefile.interfaces],
-        [${srcdir}/generate_makefile.sh ${srcdir} > Makefile.interfaces])
+        [${srcdir}/generate_makefile.sh ${srcdir} "$yamlDirs" > Makefile.interfaces],
+                    [yamlDirs="$YAML_DIRS"])
     AC_CONFIG_FILES([phosphor-dbus-interfaces.pc])
 ])
 AC_CONFIG_FILES([Makefile.yaml],
-    [${srcdir}/generate_yaml_makefile.sh ${srcdir} > Makefile.yaml])
+    [${srcdir}/generate_yaml_makefile.sh ${srcdir} "$yamlDirs" > Makefile.yaml],
+    [yamlDirs="$YAML_DIRS"])
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT