diff --git a/recipes-kernel/linux/linux-yocto-4.8/apparmor.cfg b/recipes-kernel/linux/linux-yocto-4.9/apparmor.cfg
similarity index 100%
rename from recipes-kernel/linux/linux-yocto-4.8/apparmor.cfg
rename to recipes-kernel/linux/linux-yocto-4.9/apparmor.cfg
diff --git a/recipes-kernel/linux/linux-yocto-4.8/smack-default-lsm.cfg b/recipes-kernel/linux/linux-yocto-4.9/smack-default-lsm.cfg
similarity index 100%
rename from recipes-kernel/linux/linux-yocto-4.8/smack-default-lsm.cfg
rename to recipes-kernel/linux/linux-yocto-4.9/smack-default-lsm.cfg
diff --git a/recipes-kernel/linux/linux-yocto-4.8/smack.cfg b/recipes-kernel/linux/linux-yocto-4.9/smack.cfg
similarity index 100%
rename from recipes-kernel/linux/linux-yocto-4.8/smack.cfg
rename to recipes-kernel/linux/linux-yocto-4.9/smack.cfg
diff --git a/recipes-kernel/linux/linux-yocto-4.8/tpm.cfg b/recipes-kernel/linux/linux-yocto-4.9/tpm.cfg
similarity index 100%
rename from recipes-kernel/linux/linux-yocto-4.8/tpm.cfg
rename to recipes-kernel/linux/linux-yocto-4.9/tpm.cfg
diff --git a/recipes-kernel/linux/linux-yocto-4.8/tpm.scc b/recipes-kernel/linux/linux-yocto-4.9/tpm.scc
similarity index 100%
rename from recipes-kernel/linux/linux-yocto-4.8/tpm.scc
rename to recipes-kernel/linux/linux-yocto-4.9/tpm.scc
diff --git a/recipes-kernel/linux/linux-yocto_4.8.bbappend b/recipes-kernel/linux/linux-yocto_4.9.bbappend
similarity index 69%
rename from recipes-kernel/linux/linux-yocto_4.8.bbappend
rename to recipes-kernel/linux/linux-yocto_4.9.bbappend
index 78d5101..9702dd4 100644
--- a/recipes-kernel/linux/linux-yocto_4.8.bbappend
+++ b/recipes-kernel/linux/linux-yocto_4.9.bbappend
@@ -1,9 +1,9 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.8:"
 
 # TPM kernel support
+KERNEL_FEATURES_append += "${@bb.utils.contains('DISTRO_FEATURES', 'tpm', ' features/tpm/tpm.scc', '', d)}"
+
 SRC_URI += "\
-        ${@bb.utils.contains('DISTRO_FEATURES', 'tpm', ' file://tpm.cfg', '', d)} \
-        ${@bb.utils.contains('DISTRO_FEATURES', 'tpm', ' file://tpm.scc', '', d)} \
         ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor.cfg', '', d)} \
 "