diff --git a/README.md b/README.md
index dc9e3fc..907b586 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@
 Issues, Milestones, pull requests and code hosting is on GitHub:
 https://github.com/open-power/op-build
 
-Mailing list: openpower-firmware@lists.ozlabs.org
-Info/Subscribe: https://lists.ozlabs.org/listinfo/openpower-firmware
+Mailing list: openpower-firmware@lists.ozlabs.org  
+Info/Subscribe: https://lists.ozlabs.org/listinfo/openpower-firmware  
 Archives: https://lists.ozlabs.org/pipermail/openpower-firmware/
 
 ## Building an image
diff --git a/openpower/configs/hostboot/witherspoon.config b/openpower/configs/hostboot/witherspoon.config
index 91e3ba5..ff2a828 100755
--- a/openpower/configs/hostboot/witherspoon.config
+++ b/openpower/configs/hostboot/witherspoon.config
@@ -1,48 +1,45 @@
 # The Serial Flash Controller is the AST2400 BMC.
-set   SFC_IS_AST2400
+set   SFC_IS_AST2500
 unset   BMC_DOES_SFC_INIT
 unset SFC_IS_IBM_DPSS
 set   ALLOW_MICRON_PNOR
 set   ALLOW_MACRONIX_PNOR
 
 # VPD options.
-unset MVPD_READ_FROM_HW
-unset MVPD_WRITE_TO_HW
+set MVPD_READ_FROM_HW
+set MVPD_WRITE_TO_HW
 set MVPD_READ_FROM_PNOR
 set MVPD_WRITE_TO_PNOR
-unset DJVPD_READ_FROM_HW
+set DJVPD_READ_FROM_HW
 unset DJVPD_WRITE_TO_HW
 set DJVPD_READ_FROM_PNOR
 set DJVPD_WRITE_TO_PNOR
-unset CVPD_READ_FROM_HW
-unset CVPD_WRITE_TO_HW
+set CVPD_READ_FROM_HW
+set CVPD_WRITE_TO_HW
 set CVPD_READ_FROM_PNOR
 set CVPD_WRITE_TO_PNOR
-unset PVPD_READ_FROM_HW
-unset PVPD_WRITE_TO_HW
-unset PVPD_READ_FROM_PNOR
-unset PVPD_WRITE_TO_PNOR
-unset SKIP_RESTRICT_EX_UNITS
-set CDIMM_FORMAT_FOR_CVPD
+set PVPD_READ_FROM_HW
+set PVPD_WRITE_TO_HW
+set PVPD_READ_FROM_PNOR
+set PVPD_WRITE_TO_PNOR
+unset CDIMM_FORMAT_FOR_CVPD
 
 # gpio config
-unset GPIODD
+set GPIODD
 unset PALMETTO_VDDR
 
 # Enable SBE updates
 unset SBE_UPDATE_INDEPENDENT
-set SBE_UPDATE_SEQUENTIAL
+unset SBE_UPDATE_SEQUENTIAL
+set NO_SBE_UPDATES
 
-set PCIE_HOTPLUG_CONTROLLER
+unset PCIE_HOTPLUG_CONTROLLER
 
 # turn on console output
 set CONSOLE
 set BMC_AST2500
 
-# Enable Kingston dimm voltage workaround
-unset KINGSTON_1_35_VOLT
-
-unset DISABLE_HOSTBOOT_RUNTIME
+set DISABLE_HOSTBOOT_RUNTIME
 
 # Compile in hostboot runtime PRD
 set HBRT_PRD
@@ -63,3 +60,7 @@
 
 # set for trace debug to console
 unset CONSOLE_OUTPUT_TRACE
+
+unset CONFIG_SECUREBOOT
+unset CONFIG_TPMDD
+unset CONFIG_TPM_NUVOTON
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0004-fix-AST2500-config.patch b/openpower/package/hostboot/p9Patches/hostboot-0004-fix-AST2500-config.patch
new file mode 100644
index 0000000..ef8e8b8
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0004-fix-AST2500-config.patch
@@ -0,0 +1,26 @@
+From b445b4bed1fedb7521663ebe8f6c02aa84b72fdd Mon Sep 17 00:00:00 2001
+From: Matt Ploetz <maploetz@us.ibm.com>
+Date: Sun, 6 Nov 2016 19:20:39 -0600
+Subject: [PATCH] Change AST2400 to default only if AST2500 isn't set
+
+Change-Id: Ic9c1da281fcdc650e7528a84377d4fbe51355c84
+---
+ src/usr/pnor/HBconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/usr/pnor/HBconfig b/src/usr/pnor/HBconfig
+index c0dfde8..9043bbb 100644
+--- a/src/usr/pnor/HBconfig
++++ b/src/usr/pnor/HBconfig
+@@ -5,7 +5,7 @@ config SFC_IS_IBM_DPSS
+         The Serial Flash Controller is the IBM DPSS FPGA.
+ 
+ config SFC_IS_AST2400
+-    default y
++    default if !SFC_IS_AST2500
+     depends on !SFC_IS_IBM_DPSS && !SFC_IS_FAKE && !SFC_IS_AST2500
+     help
+         The Serial Flash Controller is the AST2400 BMC.
+-- 
+1.8.2.2
+
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0004-include-pvpd.patch b/openpower/package/hostboot/p9Patches/hostboot-0004-include-pvpd.patch
new file mode 100644
index 0000000..eadb293
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0004-include-pvpd.patch
@@ -0,0 +1,25 @@
+From 6a6b23ff055da56f758d3719abecae4ebc464e9f Mon Sep 17 00:00:00 2001
+From: Matt Ploetz <maploetz@us.ibm.com>
+Date: Wed, 2 Nov 2016 16:29:26 -0500
+Subject: [PATCH] Include pvpd in dvpd
+
+Change-Id: Iff83d5ab6cebabb623f9317f34b5b8d46e5d7554
+---
+ src/usr/vpd/dvpd.C | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/usr/vpd/dvpd.C b/src/usr/vpd/dvpd.C
+index 9ce0999..2839172 100644
+--- a/src/usr/vpd/dvpd.C
++++ b/src/usr/vpd/dvpd.C
+@@ -43,6 +43,7 @@
+ #include "dvpd.H"
+ #include "cvpd.H"
+ #include "vpd.H"
++#include "pvpd.H"
+ #include <initservice/initserviceif.H>
+ 
+ 
+-- 
+1.8.2.2
+
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 51fc075..0e96b49 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
 
 config BR2_SKIBOOT_VERSION
 	string
-	default "skiboot-5.4.0-rc3" if BR2_SKIBOOT_LATEST_VERSION
+	default "skiboot-5.4.0-rc4" if BR2_SKIBOOT_LATEST_VERSION
 	default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_SKIBOOT_CUSTOM_VERSION