diff --git a/meta-phosphor/recipes-kernel/linux/linux-%.bbappend b/meta-phosphor/recipes-kernel/linux/linux-%.bbappend
index 32876c4..db375e4 100644
--- a/meta-phosphor/recipes-kernel/linux/linux-%.bbappend
+++ b/meta-phosphor/recipes-kernel/linux/linux-%.bbappend
@@ -1,2 +1,5 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}:"
-SRC_URI:append = " file://systemd-bootchart.cfg"
+SRC_URI:append = " \
+        file://systemd-bootchart.cfg \
+        ${@bb.utils.contains('DISTRO_FEATURES', 'mctp', 'file://mctp/mctp.scc file://mctp/mctp.cfg', '', d)} \
+        "
diff --git a/meta-phosphor/recipes-kernel/linux/mctp/mctp.cfg b/meta-phosphor/recipes-kernel/linux/mctp/mctp.cfg
new file mode 100644
index 0000000..26f3c41
--- /dev/null
+++ b/meta-phosphor/recipes-kernel/linux/mctp/mctp.cfg
@@ -0,0 +1,3 @@
+CONFIG_MCTP=y
+CONFIG_MCTP_SERIAL=y
+CONFIG_MCTP_TRANSPORT_I2C=y
diff --git a/meta-phosphor/recipes-kernel/linux/mctp/mctp.scc b/meta-phosphor/recipes-kernel/linux/mctp/mctp.scc
new file mode 100644
index 0000000..d1fe804
--- /dev/null
+++ b/meta-phosphor/recipes-kernel/linux/mctp/mctp.scc
@@ -0,0 +1,3 @@
+define KFEATURE_DESCRIPTION "Enable MCTP"
+
+kconf non-hardware mctp.cfg