diff --git a/openpower/configs/hostboot/firestone.config b/openpower/configs/hostboot/firestone.config
index 6684dd6..efd44cc 100755
--- a/openpower/configs/hostboot/firestone.config
+++ b/openpower/configs/hostboot/firestone.config
@@ -7,13 +7,19 @@
 
 # VPD options.
 set MVPD_READ_FROM_HW
-unset MVPD_READ_FROM_PNOR
+set MVPD_WRITE_TO_HW
+set MVPD_READ_FROM_PNOR
+set MVPD_WRITE_FROM_PNOR
 set DJVPD_READ_FROM_HW
-unset DJVPD_READ_FROM_PNOR
+set DJVPD_WRITE_TO_HW
+set DJVPD_READ_FROM_PNOR
+set DJVPD_WRITE_TO_PNOR
 set CVPD_READ_FROM_HW
-#set CVPD_WRITE_TO_HW
-unset CVPD_READ_FROM_PNOR
+set CVPD_WRITE_TO_HW
+set CVPD_READ_FROM_PNOR
+set CVPD_WRITE_TO_PNOR
 set SKIP_RESTRICT_EX_UNITS
+unset CDIMM_FORMAT_FOR_CVPD
 
 # gpio config
 set GPIODD
diff --git a/openpower/package/hostboot/hostboot-0021-Fix-more-than-2-PT-keywords-in-MVPD-VTOC.patch b/openpower/package/hostboot/hostboot-0021-Fix-more-than-2-PT-keywords-in-MVPD-VTOC.patch
new file mode 100644
index 0000000..2e8a811
--- /dev/null
+++ b/openpower/package/hostboot/hostboot-0021-Fix-more-than-2-PT-keywords-in-MVPD-VTOC.patch
@@ -0,0 +1,26 @@
+From d64701a8932f53511485f23b8acfb9c564b72297 Mon Sep 17 00:00:00 2001
+From: Matt Ploetz <maploetz@us.ibm.com>
+Date: Wed, 15 Apr 2015 14:51:11 -0500
+Subject: [PATCH] Fix for firestone vpd cache
+
+Change-Id: Ica112e3d5d131b0171b7b54d85a3810582a08e27
+---
+ src/usr/vpd/ipvpd.C | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/usr/vpd/ipvpd.C b/src/usr/vpd/ipvpd.C
+index b409c50..3738c61 100644
+--- a/src/usr/vpd/ipvpd.C
++++ b/src/usr/vpd/ipvpd.C
+@@ -1333,7 +1333,7 @@ IpVpdFacade::getRecordListSeeprom ( std::list<TocPtRecord> & o_recList,
+     offset = le16toh( toc_rec->record_offset ) + 1;  // skip 'large resource'
+ 
+     // Read the PT keyword(s) from the VTOC
+-    for (uint16_t index = 0; index < 2; ++index)
++    for (uint16_t index = 0; index < 3; ++index)
+     {
+         pt_len = sizeof(l_buffer);
+         err = retrieveKeyword( "PT",
+-- 
+1.8.2.2
+