diff --git a/openpower/package/hostboot/p9Patches/hostboot-0002-remove-attr-override-compile.patch b/openpower/package/hostboot/p9Patches/hostboot-0002-remove-attr-override-compile.patch
index 362121f..6ae8248 100644
--- a/openpower/package/hostboot/p9Patches/hostboot-0002-remove-attr-override-compile.patch
+++ b/openpower/package/hostboot/p9Patches/hostboot-0002-remove-attr-override-compile.patch
@@ -1,13 +1,29 @@
-From d71055295a21e7fe9105bdfe0085006462ab568c Mon Sep 17 00:00:00 2001
+From 53bd51536cccbef8d080a92bf4a2b16ca549af3c Mon Sep 17 00:00:00 2001
 From: Matt Ploetz <maploetz@us.ibm.com>
-Date: Tue, 9 Aug 2016 10:08:15 -0500
-Subject: [PATCH] Remove attribute override compile
+Date: Tue, 6 Sep 2016 14:08:08 -0500
+Subject: [PATCH] Remove the building and distributuion of attribute override
+ tool
 
-Change-Id: Ia3f4cda97ff1ec80619bf8b5144144903b2b24f5
+Change-Id: Ifbe7eef4152d5c5521aa6f1e2659d30aa46fd525
+RTC:160270
 ---
- src/usr/targeting/makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/build/mkrules/dist.targets.mk | 2 +-
+ src/usr/targeting/makefile        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
+index d201570..df08258 100644
+--- a/src/build/mkrules/dist.targets.mk
++++ b/src/build/mkrules/dist.targets.mk
+@@ -70,7 +70,7 @@ COPY_FILES = \
+     obj/genfiles/targAttrInfo.csv:vpo \
+     obj/genfiles/target_types_merged.xml:openpower \
+     obj/genfiles/fapiattrs.xml:openpower \
+-    obj/genfiles/attributeOverride:tools,openpower \
++    obj/genfiles/attributeOverride:tools \
+     src/usr/targeting/attroverride/README.attr_override:tools,openpower \
+     src/build/hwpf/prcd_compile.tcl:tools \
+     src/build/buildpnor/buildSbePart.pl:openpower \
 diff --git a/src/usr/targeting/makefile b/src/usr/targeting/makefile
 index 61dfb0a..c0c31ea 100644
 --- a/src/usr/targeting/makefile
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0004-remove-sbfw-check-hbDistribute.patch b/openpower/package/hostboot/p9Patches/hostboot-0004-remove-sbfw-check-hbDistribute.patch
new file mode 100644
index 0000000..74be3df
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0004-remove-sbfw-check-hbDistribute.patch
@@ -0,0 +1,40 @@
+From 52929548d943e0387fabb70d658905120cad7cd8 Mon Sep 17 00:00:00 2001
+From: Matt Ploetz <maploetz@us.ibm.com>
+Date: Tue, 6 Sep 2016 12:49:13 -0500
+Subject: [PATCH] Add openpower conditional to sbfw directory in hbDistribute
+
+Change-Id: I5e6759526a07fcbeea3a510a9a11369546367bf9
+RTC:160442
+---
+ src/build/tools/hbDistribute | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/build/tools/hbDistribute b/src/build/tools/hbDistribute
+index e999b49..75d0b14 100755
+--- a/src/build/tools/hbDistribute
++++ b/src/build/tools/hbDistribute
+@@ -116,12 +116,16 @@ fi
+ echo "sbfw dir = ${SBFW_DIR}"
+ # Verify SBFW directory or default to sandbox.
+ if [ "${SBFW_DIR}" == "invalid directory" ]; then
+-    if [ -z "${SANDBOXROOT}" -o -z "${SANDBOXNAME}" ]; then
+-        echo "ERROR:SBFW - No path specified and \$SANDBOXBASE undefined."
+-        print_usage
+-        exit -1
++    if [ "${TARGET}" == "openpower_TARGET" ]; then
++        :
+     else
+-        SBFW_DIR=${SANDBOXROOT}/${SANDBOXNAME}/src/sbei/sbfw
++        if [ -z "${SANDBOXROOT}" -o -z "${SANDBOXNAME}" ]; then
++            echo "ERROR:SBFW - No path specified and \$SANDBOXBASE undefined."
++            print_usage
++            exit -1
++        else
++            SBFW_DIR=${SANDBOXROOT}/${SANDBOXNAME}/src/sbei/sbfw
++        fi
+     fi
+ fi
+ 
+-- 
+1.8.2.2
+