diff --git a/openpower/package/machine-xml/machine-xml.mk b/openpower/package/machine-xml/machine-xml.mk
index dc05d0d..4d31c4f 100644
--- a/openpower/package/machine-xml/machine-xml.mk
+++ b/openpower/package/machine-xml/machine-xml.mk
@@ -13,13 +13,13 @@
 
 MACHINE_XML_LICENSE = Apache-2.0
 MACHINE_XML_LICENSE_FILES = LICENSE
-MACHINE_XML_DEPENDENCIES = openpower-mrw common-p8-xml
+MACHINE_XML_DEPENDENCIES =
 
 ifeq ($(BR2_OPENPOWER_POWER9),y)
 MACHINE_XML_DEPENDENCIES += hostboot
 endif
 ifeq ($(BR2_OPENPOWER_POWER8),y)
-MACHINE_XML_DEPENDENCIES += hostboot-p8
+MACHINE_XML_DEPENDENCIES += hostboot-p8 openpower-mrw common-p8-xml
 endif
 
 MACHINE_XML_INSTALL_IMAGES = YES
diff --git a/openpower/package/openpower-mrw/Config.in b/openpower/package/openpower-mrw/Config.in
index 9e3b355..ea052b4 100644
--- a/openpower/package/openpower-mrw/Config.in
+++ b/openpower/package/openpower-mrw/Config.in
@@ -1,3 +1,3 @@
 config BR2_PACKAGE_OPENPOWER_MRW
         bool "Machine Readable Workbook (MRW) infrastructure"
-        default y if (BR2_PACKAGE_HOSTBOOT_P8 || BR2_PACKAGE_HOSTBOOT_P9)
+        default y if BR2_PACKAGE_HOSTBOOT_P8