diff --git a/openpower/configs/hostboot/firestone.config b/openpower/configs/hostboot/firestone.config
index 9dc051b..07289fa 100755
--- a/openpower/configs/hostboot/firestone.config
+++ b/openpower/configs/hostboot/firestone.config
@@ -42,10 +42,9 @@
 set KINGSTON_1_35_VOLT
 
 set NO_DMI_EREPAIR
-set DISABLE_HOSTBOOT_RUNTIME
-unset HTMGT
-unset START_OCC_DURING_BOOT
-
+unset DISABLE_HOSTBOOT_RUNTIME
+set HTMGT
+set START_OCC_DURING_BOOT
 set BMC_BT_LPC_IPMI
 
 # Enable Checktop Analysis
diff --git a/openpower/package/firestone-xml/firestone.mk b/openpower/package/firestone-xml/firestone.mk
index 9387468..3e84a71 100644
--- a/openpower/package/firestone-xml/firestone.mk
+++ b/openpower/package/firestone-xml/firestone.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FIRESTONE_XML_VERSION ?= 06ef09885b9b12a4ba494454745b94e4b0b2e5b6
+FIRESTONE_XML_VERSION ?= 5123184b9f26bc1068afb9b57e796aecaf61b249
 FIRESTONE_XML_SITE ?= $(call github,open-power,firestone-xml,$(FIRESTONE_XML_VERSION))
 
 FIRESTONE_XML_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot/hostboot-0011-Support-for-OCC-Centaur-numbering.patch b/openpower/package/hostboot/hostboot-0011-Support-for-OCC-Centaur-numbering.patch
new file mode 100644
index 0000000..bbbc2ff
--- /dev/null
+++ b/openpower/package/hostboot/hostboot-0011-Support-for-OCC-Centaur-numbering.patch
@@ -0,0 +1,41 @@
+From 9d5d91597d325d63465a4f62a98bb5d8ff0f90a4 Mon Sep 17 00:00:00 2001
+From: Doug Gilbert <dgilbert@us.ibm.com>
+Date: Wed, 3 Jun 2015 14:06:09 -0500
+Subject: [PATCH] Support for OCC Centaur numbering
+
+Change-Id: I11f6641548dbb0a0f4f586f592fa0d357a6c9a84
+RTC: 127111
+Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/18179
+Tested-by: Jenkins Server
+Reviewed-by: Christopher Cain <cjcain@us.ibm.com>
+Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
+Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
+---
+ src/usr/htmgt/htmgt_cfgdata.C | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/usr/htmgt/htmgt_cfgdata.C b/src/usr/htmgt/htmgt_cfgdata.C
+index dcf1f9d..f4bcfd8 100644
+--- a/src/usr/htmgt/htmgt_cfgdata.C
++++ b/src/usr/htmgt/htmgt_cfgdata.C
+@@ -307,6 +307,8 @@ void getMemConfigMessageData(const TargetHandle_t i_occ,
+ 
+             //Centaur #
+             centPos = (*centaur)->getAttr<ATTR_POSITION>();
++            // ATTR_POSITION is system wide. Must be 0-7 on each OCC
++            centPos = centPos % 8;
+             o_data[index++] = centPos;
+ 
+             //Dimm # (0xFF since a centaur)
+@@ -425,6 +427,8 @@ void getMemThrottleMessageData(const TargetHandle_t i_occ,
+     for (centaur=centaurs.begin(); centaur!=centaurs.end(); ++centaur)
+     {
+         centPos = (*centaur)->getAttr<ATTR_POSITION>();
++        // ATTR_POSITION is system wide. Must 0-7 on each OCC
++        centPos = centPos % 8;
+ 
+         mbas.clear();
+         getChildAffinityTargets(mbas, *centaur,
+-- 
+2.3.0
+