diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
index d6031ce..9c9e145 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon_defconfig
@@ -1,5 +1,6 @@
 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 --disable-libsanitizer"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index 2e072e6..11a69e9 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 
-HOSTBOOT_BINARIES_VERSION ?= 6924d6b711ba7b1d4c47346c9a8dff88cfaaf4c8
+HOSTBOOT_BINARIES_VERSION ?= f9351dbabe338ecb0ee4f3d4dd28e487899e45b6
 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 380af58..199d737 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 ?= 8ea7d7ed5db4ce693fa5b261a2edd567681334d3
+HOSTBOOT_VERSION_BRANCH_MASTER ?= fed203b290c12b7b634c04eeec2b95fc496a726f
 
 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-stop4-stop5.patch b/openpower/patches/witherspoon-patches/machine-xml/0001-disable-stop4-stop5.patch
new file mode 100644
index 0000000..e8601a7
--- /dev/null
+++ b/openpower/patches/witherspoon-patches/machine-xml/0001-disable-stop4-stop5.patch
@@ -0,0 +1,26 @@
+From 6671d5cd2e774fd36acbbcacc2929395522fa554 Mon Sep 17 00:00:00 2001
+From: Stewart Smith <stewart@linux.vnet.ibm.com>
+Date: Wed, 28 Feb 2018 10:09:33 +1100
+Subject: [PATCH] disable stop4 and stop5
+
+Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
+---
+ witherspoon.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/witherspoon.xml b/witherspoon.xml
+index 18d84b389cb0..e4d4dcebe969 100644
+--- a/witherspoon.xml
++++ b/witherspoon.xml
+@@ -17634,7 +17634,7 @@
+ 	</attribute>
+ 	<attribute>
+ 		<id>SUPPORTED_STOP_STATES</id>
+-		<default>0xEC000000</default>
++		<default>0xE0000000</default>
+ 	</attribute>
+ 	<attribute>
+ 		<id>SUPPORTS_DYNAMIC_MEM_VOLT</id>
+-- 
+2.14.3
+