diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 7326f51..d16228a 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 ?= 55b2bbc15289496db3c2315ac6d4f5f697095fca
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 5799315afe7246ffb3609819cb27224e6e91c378
 
 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-0003-Apply-RINGOVD-to-SBE-image-prior-to-core-data.patch b/openpower/package/hostboot/p9Patches/hostboot-0003-Apply-RINGOVD-to-SBE-image-prior-to-core-data.patch
new file mode 100644
index 0000000..39db238
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0003-Apply-RINGOVD-to-SBE-image-prior-to-core-data.patch
@@ -0,0 +1,113 @@
+From 71be7757544b29527ac75fcbc0dc32b9cff16b95 Mon Sep 17 00:00:00 2001
+From: Dean Sanner <dsanner@us.ibm.com>
+Date: Thu, 20 Apr 2017 13:03:13 -0500
+Subject: [PATCH] Apply RINGOVD to SBE image prior to core data
+
+  -SBE is tight on space and if ALL core data is applied
+   then ring override section doesn't fit.  Since this is
+   debug only, apply ring overrides to the base and let
+   code winnow down the boot cores to fit constraints
+
+Change-Id: Ic0338e94b65d0481c51aac1dfa42f1c95abc9a4c
+---
+ src/usr/sbe/sbe_update.C | 54 ++++++++++++++++++++++++------------------------
+ src/usr/sbe/sbe_update.H |  4 ++++
+ 2 files changed, 31 insertions(+), 27 deletions(-)
+
+diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C
+index 3b33345..8bbc471 100644
+--- a/src/usr/sbe/sbe_update.C
++++ b/src/usr/sbe/sbe_update.C
+@@ -930,8 +930,6 @@ namespace SBE
+             TRACFCOMP( g_trac_sbe,
+                        INFO_MRK"ringOvd():Valid overrides, applying them");
+ 
+-            // Hard coded value, pass in 2KB max
+-            uint32_t RING_OVD_SIZE = 0x800;
+             FAPI_INVOKE_HWP(l_err,p9_xip_section_append,
+                             (void *)l_pnorRingOvd.vaddr,
+                             RING_OVD_SIZE,
+@@ -1047,31 +1045,6 @@ namespace SBE
+                 // Check for no error and use of input cores
+                 if ( (NULL == err) && (procIOMask == coreMask))
+                 {
+-                    // Check if we have a valid ring override section and
+-                    // append it in if so
+-                    uint32_t l_ovdImgSize = static_cast<uint32_t>(i_maxImgSize);
+-                    err = ringOvd(io_imgPtr,l_ovdImgSize);
+-                    if(err)
+-                    {
+-                        TRACFCOMP( g_trac_sbe,
+-                              ERR_MRK"procCustomizeSbeImg(): "
+-                              "Error in call to ringOvd!");
+-                        break;
+-                    }
+-                    // If it's larger then the original size then we added some
+-                    // overrides
+-                    if(l_ovdImgSize > tmpImgSize)
+-                    {
+-                        // We added an override so adjust tmpImgSize
+-                        TRACFCOMP( g_trac_sbe,
+-                              INFO_MRK"procCustomizeSbeImg(): We added some "
+-                              "ring overrides, initial image size:%u "
+-                              "new image size:%u",
+-                              tmpImgSize, l_ovdImgSize);
+-
+-                        tmpImgSize = l_ovdImgSize;
+-                    }
+-
+                     // Procedure was successful
+                     procedure_success = true;
+ 
+@@ -1879,6 +1852,33 @@ namespace SBE
+                 break;
+             }
+ 
++            /*******************************************/
++            /*  Append RINGOVD Image from PNOR to SBE  */
++            /*******************************************/
++            // Check if we have a valid ring override section and
++            // append it in if so
++            uint32_t l_ovdImgSize =
++              static_cast<uint32_t>(sbeHbblImgSize+RING_OVD_SIZE);
++            err = ringOvd(sbeHbblImgPtr,l_ovdImgSize);
++            if(err)
++            {
++                TRACFCOMP( g_trac_sbe,
++                           ERR_MRK"procCustomizeSbeImg(): "
++                           "Error in call to ringOvd!");
++                break;
++            }
++
++            //If it's larger then the original size then we added some overrides
++            if(l_ovdImgSize > sbeHbblImgSize)
++            {
++                // We added an override so adjust tmpImgSize
++                TRACFCOMP( g_trac_sbe,
++                           INFO_MRK"procCustomizeSbeImg(): We added some "
++                           "ring overrides, initial image size:%u "
++                           "new image size:%u",
++                           sbeHbblImgSize, l_ovdImgSize);
++            }
++
+ 
+             /*******************************************/
+             /*  Customize SBE/HBBL Image and           */
+diff --git a/src/usr/sbe/sbe_update.H b/src/usr/sbe/sbe_update.H
+index d4ed027..8d82cb5 100644
+--- a/src/usr/sbe/sbe_update.H
++++ b/src/usr/sbe/sbe_update.H
+@@ -85,6 +85,10 @@ namespace SBE
+     // (PERV_SB_CS_SCOM 0x00050008 or PERV_SB_CS_FSI 0x2808)
+     const uint64_t SBE_BOOT_SELECT_MASK = 0x0000400000000000;
+ 
++    // Hard coded value, pass in 1KB max
++    const uint32_t RING_OVD_SIZE = 0x400;
++
++
+     // PNOR SBE and SBEC Partition constants
+     const uint32_t MAX_SBE_ENTRIES = 9;
+     const uint32_t SBETOC_EYECATCH = 0x53424500;  //'SBE\0'
+-- 
+1.8.2.2
+
diff --git a/openpower/package/sbe/sbe-1000-Revert-Adu-moved-to-pibmem-for-lab-performance-im.patch b/openpower/package/sbe/sbe-1000-Revert-Adu-moved-to-pibmem-for-lab-performance-im.patch
new file mode 100644
index 0000000..6d9255c
--- /dev/null
+++ b/openpower/package/sbe/sbe-1000-Revert-Adu-moved-to-pibmem-for-lab-performance-im.patch
@@ -0,0 +1,138 @@
+From d4a199c33929e3257a53506a22f15ab8965ebcac Mon Sep 17 00:00:00 2001
+From: Sachin Gupta <sgupta2m@in.ibm.com>
+Date: Thu, 13 Apr 2017 07:46:05 -0500
+Subject: [PATCH v1] Revert "Adu moved to pibmem for lab performance
+ improvement"
+
+This reverts commit c2482796143deef37befa450b3fa73d4cfa1dcff.
+---
+ src/build/import_hwp_mk/istep2/istep2files.mk           |  7 +++++++
+ src/build/import_hwp_mk/istep4/istep4files.mk           |  3 +--
+ src/build/import_hwp_mk/istep5/istep5files.mk           |  5 +----
+ src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk | 11 +++++------
+ src/build/linkerscripts/linkseeprom.cmd                 |  2 +-
+ src/sbefw/Makefile                                      |  2 +-
+ 6 files changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/src/build/import_hwp_mk/istep2/istep2files.mk b/src/build/import_hwp_mk/istep2/istep2files.mk
+index b1fa9c0..ad20cb1 100644
+--- a/src/build/import_hwp_mk/istep2/istep2files.mk
++++ b/src/build/import_hwp_mk/istep2/istep2files.mk
+@@ -41,6 +41,13 @@ ISTEP2-CPP-SOURCES +=p9_sbe_tp_chiplet_init2.C
+ ISTEP2-CPP-SOURCES +=p9_sbe_tp_arrayinit.C
+ ISTEP2-CPP-SOURCES +=p9_sbe_tp_initf.C
+ ISTEP2-CPP-SOURCES +=p9_sbe_tp_chiplet_init3.C
++# TODO via RTC 170704
++# These procedures also needed in PIBMEM. Just having a quick fix
++# for lab
++ISTEP2-CPP-SOURCES +=p9_pm_ocb_indir_access.C
++ISTEP2-CPP-SOURCES +=p9_pm_ocb_indir_setup_circular.C
++ISTEP2-CPP-SOURCES +=p9_pm_ocb_indir_setup_linear.C
++ISTEP2-CPP-SOURCES +=p9_pm_ocb_init.C
+ ISTEP2-C-SOURCES =
+ ISTEP2-S-SOURCES =
+ 
+diff --git a/src/build/import_hwp_mk/istep4/istep4files.mk b/src/build/import_hwp_mk/istep4/istep4files.mk
+index e4d0a42..5fa151e 100644
+--- a/src/build/import_hwp_mk/istep4/istep4files.mk
++++ b/src/build/import_hwp_mk/istep4/istep4files.mk
+@@ -5,7 +5,7 @@
+ #
+ # OpenPOWER sbe Project
+ #
+-# Contributors Listed Below - COPYRIGHT 2016,2017
++# Contributors Listed Below - COPYRIGHT 2016
+ # [+] International Business Machines Corp.
+ #
+ #
+@@ -60,7 +60,6 @@ ISTEP4-CPP-SOURCES +=p9_ncu_scom.C
+ ISTEP4-CPP-SOURCES +=p9_l2_scom.C
+ ISTEP4-CPP-SOURCES +=p9_l3_scom.C
+ ISTEP4-CPP-SOURCES +=p9_common_poweronoff.C
+-ISTEP4-CPP-SOURCES +=p9_sbe_check_master_stop15.C
+ ISTEP4-C-SOURCES =
+ ISTEP4-S-SOURCES =
+ 
+diff --git a/src/build/import_hwp_mk/istep5/istep5files.mk b/src/build/import_hwp_mk/istep5/istep5files.mk
+index 6c99335..3593ba2 100644
+--- a/src/build/import_hwp_mk/istep5/istep5files.mk
++++ b/src/build/import_hwp_mk/istep5/istep5files.mk
+@@ -5,8 +5,7 @@
+ #
+ # OpenPOWER sbe Project
+ #
+-# Contributors Listed Below - COPYRIGHT 2016,2017
+-# [+] International Business Machines Corp.
++# Contributors Listed Below - COPYRIGHT 2016
+ #
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+@@ -31,8 +30,6 @@
+ ##########################################################################
+ 
+ ISTEP5-CPP-SOURCES = p9_sbe_instruct_start.C
+-ISTEP5-CPP-SOURCES +=p9_thread_control.C
+-ISTEP5-CPP-SOURCES +=p9_sbe_load_bootloader.C
+ ISTEP5-C-SOURCES =
+ ISTEP5-S-SOURCES =
+ 
+diff --git a/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk b/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk
+index 8833c75..adfa05f 100644
+--- a/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk
++++ b/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk
+@@ -29,21 +29,20 @@
+ ##########################################################################
+ # Object Files
+ ##########################################################################
+-ISTEPCOMMON-CPP-SOURCES +=p9_sbe_common.C
+ ISTEPCOMMON-CPP-SOURCES +=p9_perv_sbe_cmn.C
++ISTEPCOMMON-CPP-SOURCES +=p9_sbe_common.C
+ ISTEPCOMMON-CPP-SOURCES +=p9_sbe_gear_switcher.C
++ISTEPCOMMON-CPP-SOURCES +=p9_sbe_check_master_stop15.C
++ISTEPCOMMON-CPP-SOURCES +=p9_ram_core.C
++ISTEPCOMMON-CPP-SOURCES +=p9_thread_control.C
+ ISTEPCOMMON-CPP-SOURCES +=p9_fbc_utils.C
++ISTEPCOMMON-CPP-SOURCES +=p9_sbe_load_bootloader.C
+ ISTEPCOMMON-CPP-SOURCES +=p9_pba_access.C
+ ISTEPCOMMON-CPP-SOURCES +=p9_pba_coherent_utils.C
+ ISTEPCOMMON-CPP-SOURCES +=p9_pba_setup.C
+-ISTEPCOMMON-CPP-SOURCES +=p9_pm_ocb_indir_access.C
+-ISTEPCOMMON-CPP-SOURCES +=p9_pm_ocb_indir_setup_circular.C
+-ISTEPCOMMON-CPP-SOURCES +=p9_pm_ocb_indir_setup_linear.C
+-ISTEPCOMMON-CPP-SOURCES +=p9_pm_ocb_init.C
+ ISTEPCOMMON-CPP-SOURCES +=p9_adu_setup.C
+ ISTEPCOMMON-CPP-SOURCES +=p9_adu_coherent_utils.C
+ ISTEPCOMMON-CPP-SOURCES +=p9_adu_access.C
+-ISTEPCOMMON-CPP-SOURCES +=p9_ram_core.C
+ #Istep2 Procedure but this is required to run from PIBMEM
+ ISTEPCOMMON-CPP-SOURCES +=p9_sbe_tp_switch_gears.C
+ ISTEPCOMMON-CPP-SOURCES +=p9_sbe_npll_setup.C
+diff --git a/src/build/linkerscripts/linkseeprom.cmd b/src/build/linkerscripts/linkseeprom.cmd
+index cabb2c1..feabacc 100644
+--- a/src/build/linkerscripts/linkseeprom.cmd
++++ b/src/build/linkerscripts/linkseeprom.cmd
+@@ -98,7 +98,7 @@ SECTIONS
+     ////////////////////////////////
+     .text ALIGN(8): {
+          _text_origin = .; _text_offset = . - _seeprom_origin;
+-        *\libistep2.a:(.text* ) *\libistep3.a:(.text* ) *\libistep4.a:(.text* ) *\libistepmpipl.a:(.text* ) *\libistep5.a:(.text* ) } > seeprom
++        *\libistep2.a:(.text* ) *\libistep3.a:(.text* ) *\libistep4.a:(.text* ) *\libistepmpipl.a:(.text* ) } > seeprom
+      _text_size = . - _text_origin;
+ 
+    ////////////////////////////////
+diff --git a/src/sbefw/Makefile b/src/sbefw/Makefile
+index 89d16d3..56c4fce 100644
+--- a/src/sbefw/Makefile
++++ b/src/sbefw/Makefile
+@@ -5,7 +5,7 @@
+ #
+ # OpenPOWER sbe Project
+ #
+-# Contributors Listed Below - COPYRIGHT 2016,2017
++# Contributors Listed Below - COPYRIGHT 2016
+ # [+] International Business Machines Corp.
+ #
+ #
+-- 
+1.8.2.2
+
diff --git a/openpower/package/witherspoon-xml/witherspoon.mk b/openpower/package/witherspoon-xml/witherspoon.mk
index c34eee7..ef9f19f 100644
--- a/openpower/package/witherspoon-xml/witherspoon.mk
+++ b/openpower/package/witherspoon-xml/witherspoon.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WITHERSPOON_XML_VERSION ?= 07ef29dcfbfe88943a0fde35bebeec79d0fee62d
+WITHERSPOON_XML_VERSION ?= 9f27890d189eb79f1365e53d3350881060a75448
 WITHERSPOON_XML_SITE ?= $(call github,open-power,witherspoon-xml,$(WITHERSPOON_XML_VERSION))
 
 WITHERSPOON_XML_LICENSE = Apache-2.0
diff --git a/openpower/package/zaius-xml/zaius.mk b/openpower/package/zaius-xml/zaius.mk
index 3d3380a..4edb5ff 100644
--- a/openpower/package/zaius-xml/zaius.mk
+++ b/openpower/package/zaius-xml/zaius.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ZAIUS_XML_VERSION ?= b907705f75e5d462b9f23b894ea781ae5ab5c2bf
+ZAIUS_XML_VERSION ?= 6bcffcf4b3af8a2de7245c9d6d373b1144bd3037
 ZAIUS_XML_SITE ?= $(call github,open-power,zaius-xml,$(ZAIUS_XML_VERSION))
 
 ZAIUS_XML_LICENSE = Apache-2.0