diff --git a/openpower/package/ekb/Config.in b/openpower/package/ekb/Config.in
index 1f2a4fb..dadc064 100644
--- a/openpower/package/ekb/Config.in
+++ b/openpower/package/ekb/Config.in
@@ -30,7 +30,7 @@
 
 config BR2_EKB_VERSION
     string
-    default "05bf3e57c95e90768b81c60c2988a883d4aa01f3" if BR2_EKB_LATEST_VERSION
+    default "78b50a93efd59d54f22ad2b931e796912df974c6" if BR2_EKB_LATEST_VERSION
     default BR2_EKB_CUSTOM_VERSION_VALUE if BR2_EKB_CUSTOM_VERSION
 endif
 
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index f9db4ac..7f0888c 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -79,7 +79,9 @@
 FSP_TRACE_IMAGES_DIR = $(STAGING_DIR)/fsp-trace/
 SBE_IMAGE_DIR = $(STAGING_DIR)/../../../build/sbe-p10-"$(SBE_P10_VERSION)"/images
 DEVTREE_BIN_DIR = $(STAGING_DIR)/usr/share/pdata/
-BMC_POWER_TARGET_FILENAME = power-target.dtb
+# The pdata generated device tree file name will be based on machine xml filename
+QSTRIP_OP_MACHINE_XML_FILENAME = $(call qstrip,$(BR2_OPENPOWER_MACHINE_XML_FILENAME))
+$(eval BMC_POWER_TARGET_FILENAME = $$(patsubst %.xml,%.dtb,$(QSTRIP_OP_MACHINE_XML_FILENAME)))
 
 FILES_TO_TAR = $(HOSTBOOT_BUILD_IMAGES_DIR)/* \
                $(OUTPUT_BUILD_DIR)/skiboot-$(SKIBOOT_VERSION)/skiboot.elf \
diff --git a/openpower/package/pdata/Config.in b/openpower/package/pdata/Config.in
index 7b40ad7..6dabc16 100644
--- a/openpower/package/pdata/Config.in
+++ b/openpower/package/pdata/Config.in
@@ -32,7 +32,7 @@
 
 config BR2_PDATA_VERSION
     string
-    default "0c3782c628a728524e602c22fd3030d451844238" if BR2_PDATA_LATEST_VERSION
+    default "090fa1225c7455976962b238b93b982ac5edbdb9" if BR2_PDATA_LATEST_VERSION
     default BR2_PDATA_CUSTOM_VERSION_VALUE if BR2_PDATA_CUSTOM_VERSION
 
 endif
diff --git a/openpower/package/pdata/pdata.mk b/openpower/package/pdata/pdata.mk
index b354c8e..4ebe703 100644
--- a/openpower/package/pdata/pdata.mk
+++ b/openpower/package/pdata/pdata.mk
@@ -32,10 +32,8 @@
 PDATA_CONF_OPTS = --enable-gen_dynamicdt \
                   CHIP=$(TARGET_PROC) \
 
-PDATA_MAKE_OPTS =  SYSTEM_NAME=$(call qstrip,$(BR2_OPENPOWER_CONFIG_NAME)) \
-				   TARGET_PROC=$(TARGET_PROC) \
-				   EKB=$(EKB_STAGING_DIR) \
-				   SYSTEM_MRW_XML=$(MACHINE_XML_STAGING_DIR)/$(QSTRIP_MACHINE_XML) \
+PDATA_MAKE_OPTS =  EKB=$(EKB_STAGING_DIR) \
+                   SYSTEMS_MRW_XML=$(MACHINE_XML_STAGING_DIR)/$(QSTRIP_MACHINE_XML) \
 
 define PDATA_CREATE_M4_DIR
 		mkdir -p $(@D)/m4