diff --git a/meta-witherspoon/conf/machine/witherspoon.conf b/meta-witherspoon/conf/machine/witherspoon.conf
index 62aca43..c253bf0 100644
--- a/meta-witherspoon/conf/machine/witherspoon.conf
+++ b/meta-witherspoon/conf/machine/witherspoon.conf
@@ -3,7 +3,7 @@
 
 UBOOT_MACHINE = "ast_g5_ncsi_config"
 
-OBMC_MACHINE_FEATURES += "obmc-mrw"
+OBMC_MACHINE_FEATURES += "obmc-mrw openpower-ubi-fs"
 
 PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'vcs-pre-post'
 
diff --git a/meta-witherspoon/recipes-phosphor/mboxd/mboxd.bbappend b/meta-witherspoon/recipes-phosphor/mboxd/mboxd.bbappend
index 594a6ed..8b6248a 100644
--- a/meta-witherspoon/recipes-phosphor/mboxd/mboxd.bbappend
+++ b/meta-witherspoon/recipes-phosphor/mboxd/mboxd.bbappend
@@ -1,3 +1 @@
 MBOXD_FLASH_SIZE = "64M"
-
-PACKAGECONFIG_append = "virtual-pnor"