diff --git a/openpower/configs/witherspoon-redbud_defconfig b/openpower/configs/witherspoon-redbud_defconfig
index 05cda4a..9a42792 100644
--- a/openpower/configs/witherspoon-redbud_defconfig
+++ b/openpower/configs/witherspoon-redbud_defconfig
@@ -43,7 +43,7 @@
 BR2_OPENPOWER_POWER9=y
 BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="4b12db655c758d7ec508e8a2afe4b380d5ca4c28"
+BR2_OPENPOWER_MACHINE_XML_VERSION="9a28007ab143a3a042f7b315f26501cd5cb4b73c"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml"
 BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
 BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
diff --git a/openpower/configs/witherspoon-sequoia_defconfig b/openpower/configs/witherspoon-sequoia_defconfig
index d1c6dff..625999d 100644
--- a/openpower/configs/witherspoon-sequoia_defconfig
+++ b/openpower/configs/witherspoon-sequoia_defconfig
@@ -43,7 +43,7 @@
 BR2_OPENPOWER_POWER9=y
 BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="4b12db655c758d7ec508e8a2afe4b380d5ca4c28"
+BR2_OPENPOWER_MACHINE_XML_VERSION="9a28007ab143a3a042f7b315f26501cd5cb4b73c"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml"
 BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
 BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index 335f178..e7cc9f6 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HOSTBOOT_BINARIES_VERSION ?= 883d2186e4508f327b3c90f3ca096aa4bff6b73a
+HOSTBOOT_BINARIES_VERSION ?= cf51511662aac5331975c60aa1896b200c0ceb30
 HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
 
 HOSTBOOT_BINARIES_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 6f40135..b31fd43 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 695bd891343faf1f0ef85fe53148590e58239efd
-HOSTBOOT_VERSION_BRANCH_MASTER ?= 75333b1d93a30e2337fb5580357ff32733d28db3
+HOSTBOOT_VERSION_BRANCH_MASTER ?= be278aca06ad5dd7af01053bc9de6951f68eec15
 
 HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
 HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0001-Skip-Presence-Detect-in-HDAT-for-BMC-Type.patch b/openpower/package/hostboot/p9Patches/hostboot-0001-Skip-Presence-Detect-in-HDAT-for-BMC-Type.patch
deleted file mode 100644
index 7e34dfe..0000000
--- a/openpower/package/hostboot/p9Patches/hostboot-0001-Skip-Presence-Detect-in-HDAT-for-BMC-Type.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d9da41e3a912a916c4063d0e3995ce71b260e288 Mon Sep 17 00:00:00 2001
-From: Bill Hoffa <wghoffa@us.ibm.com>
-Date: Tue, 8 Aug 2017 14:18:41 -0500
-Subject: [PATCH] Skip Presence Detect in HDAT for BMC Type
-
-Change-Id: Iba981eef5e6535458085b1750d25a8d11aa37200
----
- src/usr/hdat/hdathostslcadata.C | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/usr/hdat/hdathostslcadata.C b/src/usr/hdat/hdathostslcadata.C
-index d112659..4599eb7 100755
---- a/src/usr/hdat/hdathostslcadata.C
-+++ b/src/usr/hdat/hdathostslcadata.C
-@@ -94,7 +94,8 @@ bool getVPDCollectedStatus(TARGETING::Target *i_Target)
- //@TODO: RTC 149382: Method to get VPD collected status for Targets
- 
-     if((i_Target->getAttr<ATTR_TYPE>() != TYPE_PCI) &&
--                   (i_Target->getAttr<ATTR_TYPE>() != TYPE_SYS))
-+              (i_Target->getAttr<ATTR_TYPE>() != TYPE_SYS) &&
-+              (i_Target->getAttr<ATTR_TYPE>() != TYPE_BMC))
-     {
-         l_vpdCollectedStatus = pvpdPresent(i_Target);
-     }
--- 
-1.8.2.2
-
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index b6c5cdf..89a553f 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENPOWER_PNOR_VERSION ?= d73af7e470ff65f7702e602a38f19c0c7a7d3c75
+OPENPOWER_PNOR_VERSION ?= 554b2efe2299575bd48f1e46e54a4e05fcf96753
 OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
 
 OPENPOWER_PNOR_LICENSE = Apache-2.0