diff --git a/meta-openpower/conf/distro/include/openpower-ubi.inc b/meta-openpower/conf/distro/include/openpower-ubi.inc
index cb488c8..95355b8 100644
--- a/meta-openpower/conf/distro/include/openpower-ubi.inc
+++ b/meta-openpower/conf/distro/include/openpower-ubi.inc
@@ -1,2 +1,4 @@
+require conf/distro/include/openpower-virtual-pnor.inc
+
 DISTRO_FEATURES += "openpower-ubi-fs"
 DISTROOVERRIDES .= ":df-openpower-ubi-fs"
diff --git a/meta-openpower/conf/distro/include/openpower-virtual-pnor.inc b/meta-openpower/conf/distro/include/openpower-virtual-pnor.inc
new file mode 100644
index 0000000..56a4a4d
--- /dev/null
+++ b/meta-openpower/conf/distro/include/openpower-virtual-pnor.inc
@@ -0,0 +1,2 @@
+DISTRO_FEATURES += "openpower-virtual-pnor"
+DISTROOVERRIDES .= ":df-openpower-virtual-pnor"