diff --git a/openpower/package/machine-xml/machine-xml.mk b/openpower/package/machine-xml/machine-xml.mk
index 91febce..af68f47 100644
--- a/openpower/package/machine-xml/machine-xml.mk
+++ b/openpower/package/machine-xml/machine-xml.mk
@@ -98,12 +98,19 @@
         if [ -e $(MRW_HB_TOOLS)/wof-tables-img ]; then \
             chmod +x $(MRW_HB_TOOLS)/wof-tables-img; \
         fi
-        
-		if [ -d $(MRW_SCRATCH)/wofdata ]; then \
-			$(MRW_HB_TOOLS)/wof-tables-img --create $(MRW_SCRATCH)/wof_output $(MRW_SCRATCH)/wofdata; \
+
+        if [ -d $(MRW_SCRATCH)/wofdata ]; then \
+            $(MRW_HB_TOOLS)/wof-tables-img --create $(MRW_SCRATCH)/wof_output $(MRW_SCRATCH)/wofdata; \
         fi
 
+        # Create the MEMD binary
+        if [ -e $(MRW_HB_TOOLS)/memd_creation.pl ]; then \
+            chmod +x $(MRW_HB_TOOLS)/memd_creation.pl; \
+        fi
 
+        if [ -d $(MRW_SCRATCH)/memd_binaries ]; then \
+            $(MRW_HB_TOOLS)/memd_creation.pl -memd_dir $(MRW_SCRATCH)/memd_binaries -memd_output $(MRW_SCRATCH)/memd_output.dat; \
+        fi
 
 endef
 
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in
index 504afef..be742c4 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -79,7 +79,7 @@
 
 config BR2_MEMDDATA_FILENAME
         string "Name of memd original file"
-        default "memd_extra"
+        default "memd_output.dat"
         help
             String used to define name of memd original file