diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.bb
index d03601f..e1823fe 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control.bb
@@ -29,4 +29,6 @@
                phosphor-dbus-interfaces \
                "
 
+EXTRA_OECONF_append = "${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'i2c-occ', ' --enable-i2c-occ', '', d)}"
+
 S = "${WORKDIR}/git"
diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/p8.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/p8.inc
new file mode 100644
index 0000000..b43045d
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/p8.inc
@@ -0,0 +1 @@
+OBMC_MACHINE_FEATURES += 'i2c-occ'
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
index 1fedc69..5d71bf4 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf
@@ -4,6 +4,7 @@
 require conf/machine/include/ast2400.inc
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/ibm.inc
+require conf/machine/include/p8.inc
 
 UBOOT_MACHINE_palmetto = "ast_g4_ncsi_config"
 UBOOT_ENTRYPOINT = "0x40008000"