diff --git a/openpower/package/firestone-xml/firestone.mk b/openpower/package/firestone-xml/firestone.mk
index 76b5755..66622f7 100644
--- a/openpower/package/firestone-xml/firestone.mk
+++ b/openpower/package/firestone-xml/firestone.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FIRESTONE_XML_VERSION ?= 5123184b9f26bc1068afb9b57e796aecaf61b249
+FIRESTONE_XML_VERSION ?= 44d46e5f009b51fd65594c0efe6bb4f2380d11b1
 FIRESTONE_XML_SITE ?= $(call github,open-power,firestone-xml,$(FIRESTONE_XML_VERSION))
 
 FIRESTONE_XML_LICENSE = Apache-2.0
diff --git a/openpower/package/habanero-xml/habanero-xml.mk b/openpower/package/habanero-xml/habanero-xml.mk
index 501bceb..38232b0 100644
--- a/openpower/package/habanero-xml/habanero-xml.mk
+++ b/openpower/package/habanero-xml/habanero-xml.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HABANERO_XML_VERSION ?= 03d911f12311ba884ec9e08a6c114daabfce545a
+HABANERO_XML_VERSION ?= b86989fce1e543a07706206f12ef00b0b6a170c7
 HABANERO_XML_SITE ?= $(call github,open-power,habanero-xml,$(HABANERO_XML_VERSION))
 
 HABANERO_XML_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot/hostboot-0003-Fix-handling-of-ECC-protected-partitions-at-runtime.patch b/openpower/package/hostboot/hostboot-0003-Fix-handling-of-ECC-protected-partitions-at-runtime.patch
deleted file mode 100644
index c9385d2..0000000
--- a/openpower/package/hostboot/hostboot-0003-Fix-handling-of-ECC-protected-partitions-at-runtime.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 69e22b2f8c8425b4f2ec8f7adcf164afed7f2ff8 Mon Sep 17 00:00:00 2001
-From: Dan Crowell <dcrowell@us.ibm.com>
-Date: Mon, 27 Apr 2015 13:48:57 -0500
-Subject: [PATCH] Fix handling of ECC protected partitions at runtime
-
-Modify the code to only check ECC on the logical size of the data
-that is read, rather than on the full physical size.
-
-Change-Id: Ia45989e64ef70e63542274ef59df2cc755f8082e
----
- src/usr/pnor/runtime/rt_pnor.C | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/usr/pnor/runtime/rt_pnor.C b/src/usr/pnor/runtime/rt_pnor.C
-index d434f26..6e52999 100644
---- a/src/usr/pnor/runtime/rt_pnor.C
-+++ b/src/usr/pnor/runtime/rt_pnor.C
-@@ -405,10 +405,12 @@ errlHndl_t RtPnor::readFromDevice (uint64_t i_procId,
-         {
-             TRACFCOMP(g_trac_pnor, "RtPnor::readFromDevice: removing ECC...");
-             // remove the ECC and fix the original data if it is broken
-+            size_t l_eccSize = (l_rc/9)*8;
-+            l_eccSize = std::min( l_eccSize, i_size );
-             PNOR::ECC::eccStatus ecc_stat =
-                  PNOR::ECC::removeECC(reinterpret_cast<uint8_t*>(l_dataToRead),
-                                       reinterpret_cast<uint8_t*>(o_data),
--                                      l_rc); //actual size of read data
-+                                      l_eccSize); //logical size of read data
- 
-             // create an error if we couldn't correct things
-             if( ecc_stat == PNOR::ECC::UNCORRECTABLE )
--- 
-1.8.2.2
-
diff --git a/openpower/package/hostboot/hostboot-0004-Remove-gard-actions-for-memory-plugging-errors.patch b/openpower/package/hostboot/hostboot-0003-Remove-gard-actions-for-memory-plugging-errors.patch
similarity index 100%
rename from openpower/package/hostboot/hostboot-0004-Remove-gard-actions-for-memory-plugging-errors.patch
rename to openpower/package/hostboot/hostboot-0003-Remove-gard-actions-for-memory-plugging-errors.patch
diff --git a/openpower/package/hostboot/hostboot-0005-SW311560-HWP-error-prevent-IPL-on-habanero.patch b/openpower/package/hostboot/hostboot-0004-SW311560-HWP-error-prevent-IPL-on-habanero.patch
similarity index 100%
rename from openpower/package/hostboot/hostboot-0005-SW311560-HWP-error-prevent-IPL-on-habanero.patch
rename to openpower/package/hostboot/hostboot-0004-SW311560-HWP-error-prevent-IPL-on-habanero.patch
diff --git a/openpower/package/hostboot/hostboot-0006-shutdown-deconfig-outside-reconfig-loop.patch b/openpower/package/hostboot/hostboot-0005-shutdown-deconfig-outside-reconfig-loop.patch
similarity index 100%
rename from openpower/package/hostboot/hostboot-0006-shutdown-deconfig-outside-reconfig-loop.patch
rename to openpower/package/hostboot/hostboot-0005-shutdown-deconfig-outside-reconfig-loop.patch
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index af7c39d..b1c3805 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HOSTBOOT_VERSION ?= 460fdf36b1fe3bc1157738cd1158a73893a1454b
+HOSTBOOT_VERSION ?= 3f6449495b5922c13c9b977b252f9638ccb8cf4c
 HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
 
 HOSTBOOT_LICENSE = Apache-2.0
diff --git a/openpower/package/palmetto-xml/palmetto-xml.mk b/openpower/package/palmetto-xml/palmetto-xml.mk
index 41c348e..2573450 100644
--- a/openpower/package/palmetto-xml/palmetto-xml.mk
+++ b/openpower/package/palmetto-xml/palmetto-xml.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PALMETTO_XML_VERSION = 9206323e35e40ca8957049965ba8e2564467040e
+PALMETTO_XML_VERSION = a712d271730f1ea28438e8d1bc30793db072510a
 PALMETTO_XML_SITE = $(call github,open-power,palmetto-xml,$(PALMETTO_XML_VERSION))
 
 PALMETTO_XML_LICENSE = Apache-2.0