diff --git a/build_image b/build_image
index d55ef34bae..907b141680 100755
--- a/build_image
+++ b/build_image
@@ -125,7 +125,7 @@ if should_build_image ${CHROMEOS_FACTORY_INSTALL_SHIM_NAME}; then
 
   BASE_PACKAGE="chromeos-base/chromeos-installshim"
 
-  export USE="${USE} initramfs vfat"
+  export USE="${USE} initramfs vfat tpm i2cdev"
 
   # On ARM, fbconsole is required to fix a display driver bug.
   if [ "${ARCH}" = "arm" ] ; then
diff --git a/mod_image_for_recovery.sh b/mod_image_for_recovery.sh
index 63ff5d17ce..0f9f3d765c 100755
--- a/mod_image_for_recovery.sh
+++ b/mod_image_for_recovery.sh
@@ -330,7 +330,8 @@ fi
 
 # Build the recovery kernel.
 FACTORY_ROOT="${BOARD_ROOT}/factory-root"
-USE="fbconsole initramfs vfat" emerge_custom_kernel "$FACTORY_ROOT" ||
+RECOVERY_KERNEL_FLAGS="fbconsole initramfs vfat tpm i2cdev"
+USE="${RECOVERY_KERNEL_FLAGS}" emerge_custom_kernel "$FACTORY_ROOT" ||
   failboat "Cannot emerge custom kernel"
 
 if [ -z "$FLAGS_kernel_image" ]; then