diff --git a/meta-phosphor/classes/mrw-xml.bbclass b/meta-phosphor/classes/mrw-xml.bbclass
index 5a9c773..8876de7 100644
--- a/meta-phosphor/classes/mrw-xml.bbclass
+++ b/meta-phosphor/classes/mrw-xml.bbclass
@@ -1,2 +1,4 @@
 MRW_XML ??= "${MACHINE}.xml"
 mrw_datadir = "${datadir}/obmc-mrw"
+SKIP_BROKEN_MRW ?= "0"
+EXTRA_MRW_SCRIPT_ARGS = "${@bb.utils.contains("SKIP_BROKEN_MRW", "0", "", "--skip-broken-mrw", d)}"