diff --git a/meta-witherspoon/conf/machine/witherspoon.conf b/meta-witherspoon/conf/machine/witherspoon.conf
index 40c8357..e3fcad8 100644
--- a/meta-witherspoon/conf/machine/witherspoon.conf
+++ b/meta-witherspoon/conf/machine/witherspoon.conf
@@ -5,9 +5,12 @@
 
 OBMC_MACHINE_FEATURES += "obmc-mrw"
 
+PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'vcs-pre-post'
+
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/ibm.inc
+require conf/machine/include/p9.inc
 
 PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml"
 PHOSPHOR_MRW_REV = "657550f28ebd09854a93c299a5a5aff182375a66"