diff --git a/openpower/package/habanero-xml/habanero-xml.mk b/openpower/package/habanero-xml/habanero-xml.mk
index a028a2b..37af8c3 100644
--- a/openpower/package/habanero-xml/habanero-xml.mk
+++ b/openpower/package/habanero-xml/habanero-xml.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HABANERO_XML_VERSION ?= 502536fa76d6d73a9001d1a329a137f4668db4e8
+HABANERO_XML_VERSION ?= 70e508863cef9abd8aab5f5013138a1255a26ee1
 HABANERO_XML_SITE ?= $(call github,open-power,habanero-xml,$(HABANERO_XML_VERSION))
 
 HABANERO_XML_LICENSE = Apache-2.0
@@ -14,42 +14,26 @@
 HABANERO_XML_INSTALL_TARGET = NO
 
 MRW_SCRATCH=$(STAGING_DIR)/openpower_mrw_scratch
-MRW_INSTALL_DIRECTORY=$(STAGING_DIR)/preprocessed_mrw
 MRW_HB_TOOLS=$(STAGING_DIR)/hostboot_build_images
 
-HABANERO_XML_ENV_VARS= \
-    SCHEMA_FILE=$(MRW_SCRATCH)/schema/mrw.xsd \
-    PARSER_PATH=$(STAGING_DIR)/usr/bin \
-    XSL_PATH=$(MRW_SCRATCH)/xslt \
-    OUTPUT_PATH=$(MRW_INSTALL_DIRECTORY)
-
 define HABANERO_XML_BUILD_CMDS
         # copy the habanero xml where the common lives
         bash -c 'mkdir -p $(MRW_SCRATCH) && cp -r $(@D)/* $(MRW_SCRATCH)'
-        mkdir -p $(MRW_INSTALL_DIRECTORY)
 
-        # run the mrw parsers
-        $(HABANERO_XML_ENV_VARS) bash -c 'cd $(MRW_SCRATCH) && $(MAKE) habanero'
-
-        # move the APSS xml to the output area
-        cp $(MRW_SCRATCH)/HABANERO_APSS.xml $(MRW_INSTALL_DIRECTORY)
-
-        # generate the system mrm xml
-        $(MRW_HB_TOOLS)/genHwsvMrwXml.pl \
-            --system=$(BR2_OPENPOWER_CONFIG_NAME) \
-            --mrwdir=$(MRW_INSTALL_DIRECTORY) \
-            --build=hb > $(MRW_INSTALL_DIRECTORY)/$(BR2_HABANERO_MRW_XML_FILENAME)
+        # generate the system mrw xml
+        perl -I $(MRW_HB_TOOLS) \
+        $(MRW_HB_TOOLS)/processMrw.pl -x $(MRW_SCRATCH)/habanero.xml
 endef
 
 define HABANERO_XML_INSTALL_IMAGES_CMDS
 
         # merge in any system specific attributes, hostboot attributes
-        $(MRW_HB_TOOLS)/mergexml.sh $(@D)/$(BR2_HABANERO_SYSTEM_XML_FILENAME) \
+        $(MRW_HB_TOOLS)/mergexml.sh $(MRW_SCRATCH)/$(BR2_HABANERO_SYSTEM_XML_FILENAME) \
             $(MRW_HB_TOOLS)/attribute_types.xml \
             $(MRW_HB_TOOLS)/attribute_types_hb.xml \
             $(MRW_HB_TOOLS)/target_types_merged.xml \
             $(MRW_HB_TOOLS)/target_types_hb.xml \
-            $(MRW_INSTALL_DIRECTORY)/$(BR2_HABANERO_MRW_XML_FILENAME) > $(MRW_HB_TOOLS)/temporary_hb.hb.xml;
+            $(MRW_SCRATCH)/$(BR2_HABANERO_MRW_XML_FILENAME) > $(MRW_HB_TOOLS)/temporary_hb.hb.xml;
 
         # creating the targeting binary
         $(MRW_HB_TOOLS)/xmltohb.pl  \