diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 1e5a095..4053dd4 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENPOWER_PNOR_VERSION ?= 544815b3f51c2882214b3cb9708e193626d1f524
+OPENPOWER_PNOR_VERSION ?= f65af64e9a554aa877f45a5adeec419145beda12
 
 # TODO: WORKAROUND: Need to reenable next line and comment out the two lines
 # after that, when code is propagated to a public repo
@@ -16,6 +16,8 @@
 OPENPOWER_PNOR_LICENSE_FILES = LICENSE
 OPENPOWER_PNOR_DEPENDENCIES = hostboot-binaries machine-xml skiboot host-openpower-ffs capp-ucode host-openpower-pnor-util
 
+SBE_P10_VERSION = $(call qstrip,$(BR2_SBE_P10_VERSION))
+
 ifeq ($(BR2_OPENPOWER_POWER9),y)
     OPENPOWER_PNOR_DEPENDENCIES += hcode
 endif
@@ -75,6 +77,7 @@
 OUTPUT_IMAGES_DIR = $(STAGING_DIR)/../../../images/
 HOSTBOOT_BUILD_IMAGES_DIR = $(STAGING_DIR)/hostboot_build_images/
 FSP_TRACE_IMAGES_DIR = $(STAGING_DIR)/fsp-trace/
+SBE_IMAGE_DIR = $(STAGING_DIR)/../../../build/sbe-p10-"$(SBE_P10_VERSION)"/images
 
 FILES_TO_TAR = $(HOSTBOOT_BUILD_IMAGES_DIR)/* \
                $(OUTPUT_BUILD_DIR)/skiboot-$(BR2_SKIBOOT_VERSION)/skiboot.elf \
@@ -149,6 +152,7 @@
 	    -ocmbfw_original_filename $(BINARIES_DIR)/$(BR2_OCMBFW_FILENAME) \
 	    -ocmbfw_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_OCMBFW_PROCESSED_FILENAME) \
             -pnor_layout $(@D)/"$(OPENPOWER_RELEASE)"Layouts/$(BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME) \
+            -sbe_img_dir $(SBE_IMAGE_DIR) \
             $(XZ_ARG) $(KEY_TRANSITION_ARG) $(SIGN_MODE_ARG) \
 
         mkdir -p $(STAGING_DIR)/pnor/
diff --git a/openpower/package/sbe-p10/0001-Update-SBE-distribute-to-export-P10-DD1-files.patch b/openpower/package/sbe-p10/0001-Update-SBE-distribute-to-export-P10-DD1-files.patch
deleted file mode 100644
index 26cea10..0000000
--- a/openpower/package/sbe-p10/0001-Update-SBE-distribute-to-export-P10-DD1-files.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b0a445addc19754ebea92ea3ee46185a3716267a Mon Sep 17 00:00:00 2001
-From: Nick Bofferding <bofferdn@us.ibm.com>
-Date: Thu, 3 Oct 2019 13:22:58 -0500
-Subject: [PATCH] Update SBE distribute to export P10 DD1 files
-
-Change-Id: I8bda043e0fe69187923abcfb1e79dd4de98e98ae
----
- src/build/sbeOpDistribute.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/build/sbeOpDistribute.py b/src/build/sbeOpDistribute.py
-index 14546d9..32b0cff 100755
---- a/src/build/sbeOpDistribute.py
-+++ b/src/build/sbeOpDistribute.py
-@@ -5,7 +5,7 @@
- #
- # OpenPOWER sbe Project
- #
--# Contributors Listed Below - COPYRIGHT 2017,2018
-+# Contributors Listed Below - COPYRIGHT 2017,2019
- # [+] International Business Machines Corp.
- #
- #
-@@ -26,8 +26,8 @@ import os
- import sys
- import getopt
- 
--CHIPID = 'p9n'
--p9n_EC = {'21':'DD2', '22':'DD2', '23':'DD2'}
-+CHIPID = 'p10'
-+p9n_EC = {'10':'DD1'}
- 
- def usage():
-     print "usage:sbeOpDistribute.py [--sbe_binary_dir] <sbe binary path> [--img_dir] <images path>"
--- 
-1.8.2.2
-
diff --git a/openpower/package/sbe-p10/0002-Temporarily-disabled-install-directive-in-SBE-distri.patch b/openpower/package/sbe-p10/0002-Temporarily-disabled-install-directive-in-SBE-distri.patch
deleted file mode 100644
index c0fb22d..0000000
--- a/openpower/package/sbe-p10/0002-Temporarily-disabled-install-directive-in-SBE-distri.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e34aaa2b68ec05f85f3d47ef37bdbd2aa5a162ae Mon Sep 17 00:00:00 2001
-From: Nick Bofferding <bofferdn@us.ibm.com>
-Date: Mon, 7 Oct 2019 15:58:41 -0500
-Subject: [PATCH] Temporarily disabled install directive in SBE distribute
-
-Change-Id: I3f54da025cde5944b098ced69be43995c495ec66
----
- src/build/sbeOpDistribute.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/build/sbeOpDistribute.py b/src/build/sbeOpDistribute.py
-index 32b0cff..373edb7 100755
---- a/src/build/sbeOpDistribute.py
-+++ b/src/build/sbeOpDistribute.py
-@@ -3,7 +3,7 @@
- #
- # $Source: src/build/sbeOpDistribute.py $
- #
--# OpenPOWER sbe Project
-+# OpenPOWER HostBoot Project
- #
- # Contributors Listed Below - COPYRIGHT 2017,2019
- # [+] International Business Machines Corp.
-@@ -103,7 +103,8 @@ def main(argv):
-             # Copy sbe raw binary to scratch folder
-             run_system_cmd('cp '+sbe_binary_dir+'/'+basename+'.bin'+' '+scratch_dir+'/'+basename+'.bin')
-             # Add HW ref image
--            run_system_cmd('p9_ipl_build '+scratch_dir+'/'+basename+'.bin '+hw_ref_image+' 0x'+ecLevel)
-+            #TODO: This is currently not working in p10 op-build
-+            # run_system_cmd('p9_ipl_build '+scratch_dir+'/'+basename+'.bin '+hw_ref_image+' 0x'+ecLevel)
-             #add pnor header
-             run_system_cmd("env echo -en VERSION\\\\0 > "+scratch_dir+"/"+basename+".sha.bin")
-             run_system_cmd("sha512sum "+scratch_dir+"/"+basename+".bin | awk '{print $1}' | xxd -pr -r >> "+scratch_dir+"/"+basename+".sha.bin")
--- 
-1.8.2.2
-
diff --git a/openpower/package/sbe-p10/Config.in b/openpower/package/sbe-p10/Config.in
index caff729..9d0a908 100644
--- a/openpower/package/sbe-p10/Config.in
+++ b/openpower/package/sbe-p10/Config.in
@@ -26,7 +26,7 @@
 
 config BR2_SBE_P10_VERSION
 	string
-	default "479c7d242feab4b4f7c9753a9a54628105b89059" if BR2_SBE_P10_LATEST_VERSION
+	default "1051866776ab75fc215fdb19eb03f26e29ac8854" if BR2_SBE_P10_LATEST_VERSION
 	default BR2_SBE_P10_CUSTOM_VERSION_VALUE \
 		if BR2_SBE_P10_CUSTOM_VERSION
 
diff --git a/openpower/package/sbe-p10/sbe-p10.mk b/openpower/package/sbe-p10/sbe-p10.mk
index 6b171e5..9ebe164 100644
--- a/openpower/package/sbe-p10/sbe-p10.mk
+++ b/openpower/package/sbe-p10/sbe-p10.mk
@@ -30,6 +30,7 @@
 	$(INSTALL) -D $(@D)/images/ipl_image_tool $(HOST_DIR)/usr/bin/
 	python $(@D)/src/build/sbeOpDistribute.py  --sbe_binary_dir=$(STAGING_DIR)/sbe_binaries --img_dir=$(@D)/images --sbe_binary_filename $(BR2_HOSTBOOT_BINARY_SBE_FILENAME)
 	cp $(@D)/src/build/sbeOpDistribute.py $(STAGING_DIR)/sbe_binaries/
+	cp $(@D)/src/build/sbeOpToolsRegister.py $(STAGING_DIR)/sbe_binaries/
 endef
 
 $(eval $(generic-package))