diff --git a/openpower/package/hostboot/p9Patches/hostboot-0004-fix-AST2500-config.patch b/openpower/package/hostboot/p9Patches/hostboot-0006-fix-AST2500-config.patch
similarity index 84%
rename from openpower/package/hostboot/p9Patches/hostboot-0004-fix-AST2500-config.patch
rename to openpower/package/hostboot/p9Patches/hostboot-0006-fix-AST2500-config.patch
index ef8e8b8..2c52864 100644
--- a/openpower/package/hostboot/p9Patches/hostboot-0004-fix-AST2500-config.patch
+++ b/openpower/package/hostboot/p9Patches/hostboot-0006-fix-AST2500-config.patch
@@ -1,4 +1,4 @@
-From b445b4bed1fedb7521663ebe8f6c02aa84b72fdd Mon Sep 17 00:00:00 2001
+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
@@ -9,7 +9,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/usr/pnor/HBconfig b/src/usr/pnor/HBconfig
-index c0dfde8..9043bbb 100644
+index c0dfde8..9ce13b1 100644
 --- a/src/usr/pnor/HBconfig
 +++ b/src/usr/pnor/HBconfig
 @@ -5,7 +5,7 @@ config SFC_IS_IBM_DPSS
@@ -17,7 +17,7 @@
  
  config SFC_IS_AST2400
 -    default y
-+    default if !SFC_IS_AST2500
++    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.