diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
index 1e0e7b0..b6b6884 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon_defconfig
@@ -1,6 +1,5 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/witherspoon-patches"
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -42,7 +41,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="58554bfabd7f356bc9db3e4938162acd445fc559"
+BR2_OPENPOWER_MACHINE_XML_VERSION="6ca015dbd3e1e9d5206f9ec13ec9db2d8965e181"
 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/zaius_defconfig b/openpower/configs/zaius_defconfig
index a09716c..754f247 100644
--- a/openpower/configs/zaius_defconfig
+++ b/openpower/configs/zaius_defconfig
@@ -1,6 +1,5 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/zaius-patches"
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -42,7 +41,7 @@
 BR2_OPENPOWER_POWER9=y
 BR2_HOSTBOOT_CONFIG_FILE="zaius.config"
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="zaius-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="b0884b3032df60e49eff4b212719f8d49a5d6be7"
+BR2_OPENPOWER_MACHINE_XML_VERSION="5e48835aacb178c77e2c8a02be6d6e939f1c1090"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="zaius.xml"
 BR2_OPENPOWER_SYSTEM_XML_FILENAME="ZAIUS_hb.system.xml"
 BR2_OPENPOWER_MRW_XML_FILENAME="ZAIUS_hb.mrw.xml"
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index c41fb68..380af58 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= d3025f5d7ddd0723946bb54fcb471d2bf1fd2da4
-HOSTBOOT_VERSION_BRANCH_MASTER ?= 28927a78ca4144aa8214d35b7ad7e2ddba5ada4e
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 8ea7d7ed5db4ce693fa5b261a2edd567681334d3
 
 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/patches/witherspoon-patches/machine-xml/0001-Disable-stop11-to-workaround-special-wakeup-bug.patch b/openpower/patches/witherspoon-patches/machine-xml/0001-Disable-stop11-to-workaround-special-wakeup-bug.patch
deleted file mode 100644
index 7531aa6..0000000
--- a/openpower/patches/witherspoon-patches/machine-xml/0001-Disable-stop11-to-workaround-special-wakeup-bug.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4a67af9ad8cafeac5bddbcad3e7d875ab5538c27 Mon Sep 17 00:00:00 2001
-From: Stewart Smith <stewart@linux.vnet.ibm.com>
-Date: Thu, 15 Feb 2018 14:18:07 +1100
-Subject: [PATCH] Disable stop11 to workaround special wakeup bug
-
-Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
----
- witherspoon.xml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/witherspoon.xml b/witherspoon.xml
-index 09a09fc68217..eddd1ac257e6 100644
---- a/witherspoon.xml
-+++ b/witherspoon.xml
-@@ -17295,7 +17295,7 @@
- 	</attribute>
- 	<attribute>
- 		<id>SUPPORTED_STOP_STATES</id>
--		<default>0xEC100000</default>
-+		<default>0xEC000000</default>
- 	</attribute>
- 	<attribute>
- 		<id>SUPPORTS_DYNAMIC_MEM_VOLT</id>
--- 
-2.14.3
-
diff --git a/openpower/patches/zaius-patches/machine-xml/0001-Update-EREPAIR-attributes.patch b/openpower/patches/zaius-patches/machine-xml/0001-Update-EREPAIR-attributes.patch
deleted file mode 100644
index 0f352ae..0000000
--- a/openpower/patches/zaius-patches/machine-xml/0001-Update-EREPAIR-attributes.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From b2391175e61b3d1bd7e5fdba719d7fd2925fdbed Mon Sep 17 00:00:00 2001
-From: Adrian Barrera <abarrera@us.ibm.com>
-Date: Tue, 6 Feb 2018 18:38:21 -0600
-Subject: [PATCH 1/2] Update EREPAIR attributes
-
----
- zaius.xml | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/zaius.xml b/zaius.xml
-index 3b9f54a884d4..df1f4dfcd2d0 100644
---- a/zaius.xml
-+++ b/zaius.xml
-@@ -8972,11 +8972,11 @@
- 	</attribute>
- 	<attribute>
- 		<id>DMI_EREPAIR_THRESHOLD_FIELD</id>
--		<default></default>
-+		<default>0x1</default>
- 	</attribute>
- 	<attribute>
- 		<id>DMI_EREPAIR_THRESHOLD_MNFG</id>
--		<default></default>
-+		<default>0x0</default>
- 	</attribute>
- 	<attribute>
- 		<id>DO_ABUS_DECONFIG</id>
-@@ -9932,6 +9932,14 @@
- 		<id>OS_IPL_MODE</id>
- 		<default></default>
- 	</attribute>
-+        <attribute>
-+                <id>O_EREPAIR_THRESHOLD_FIELD</id>
-+                <default>0x1</default>
-+        </attribute>
-+        <attribute>
-+                <id>O_EREPAIR_THRESHOLD_MNFG</id>
-+                <default>0x0</default>
-+        </attribute>
- 	<attribute>
- 		<id>PAYLOAD_BASE</id>
- 		<default>0</default>
-@@ -10543,11 +10551,11 @@
- 	</attribute>
- 	<attribute>
- 		<id>X_EREPAIR_THRESHOLD_FIELD</id>
--		<default></default>
-+		<default>0x1</default>
- 	</attribute>
- 	<attribute>
- 		<id>X_EREPAIR_THRESHOLD_MNFG</id>
--		<default></default>
-+		<default>0x0</default>
- 	</attribute>
- 	<attribute>
- 		<id>power-def-filenames</id>
--- 
-2.14.3
-
diff --git a/openpower/patches/zaius-patches/machine-xml/0002-Update-Obus-PLL-bucket-to-25G.patch b/openpower/patches/zaius-patches/machine-xml/0002-Update-Obus-PLL-bucket-to-25G.patch
deleted file mode 100644
index 58b69af..0000000
--- a/openpower/patches/zaius-patches/machine-xml/0002-Update-Obus-PLL-bucket-to-25G.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d3a35441092c3616e69a2e3c81c0e2f1f5df96ed Mon Sep 17 00:00:00 2001
-From: Adrian Barrera <abarrera@us.ibm.com>
-Date: Fri, 9 Feb 2018 15:23:55 -0600
-Subject: [PATCH 2/2] Update Obus PLL bucket to 25G
-
----
- zaius.xml | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/zaius.xml b/zaius.xml
-index df1f4dfcd2d0..9929e8b9f5a4 100644
---- a/zaius.xml
-+++ b/zaius.xml
-@@ -14407,19 +14407,19 @@
- 	</attribute>
- 	<attribute>
- 		<id>OB0_PLL_BUCKET</id>
--		<default>2</default>
-+		<default>1</default>
- 	</attribute>
- 	<attribute>
- 		<id>OB1_PLL_BUCKET</id>
--		<default>2</default>
-+		<default>1</default>
- 	</attribute>
- 	<attribute>
- 		<id>OB2_PLL_BUCKET</id>
--		<default>2</default>
-+		<default>1</default>
- 	</attribute>
- 	<attribute>
- 		<id>OB3_PLL_BUCKET</id>
--		<default>2</default>
-+		<default>1</default>
- 	</attribute>
- 	<attribute>
- 		<id>OBUS_RATIO_VALUE</id>
--- 
-2.14.3
-