diff --git a/openpower/package/hostboot/p9Patches/hostboot-0006-fix-AST2500-config.patch b/openpower/package/hostboot/p9Patches/hostboot-0006-fix-AST2500-config.patch
new file mode 100644
index 0000000..2c52864
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0006-fix-AST2500-config.patch
@@ -0,0 +1,26 @@
+From 4bd0930e6d63bf714188ecacbe06a162b3529351 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..9ce13b1 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 y 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
+