diff --git a/tool/autopilot b/tool/autopilot
index 2667cb0b0..a4c178dfb 100755
--- a/tool/autopilot
+++ b/tool/autopilot
@@ -305,6 +305,17 @@ foreach platform $platforms {
 		exec echo "CUSTOM_CC  = ccache \$(CROSS_DEV_PREFIX)gcc" >> $tools_conf
 		exec echo "CUSTOM_CXX = ccache \$(CROSS_DEV_PREFIX)g++" >> $tools_conf
 	}
+
+	if {[info exists ::env(RUN_OPT_AUTOPILOT)]} {
+		set kernel [exec echo $platform |& sed {s/_.*//}]
+
+		# lx_hybrid is a special case, it also uses boot_dir/linux
+		if {[string equal $kernel "lx"]} {
+			set kernel linux
+		}
+
+		exec echo "RUN_OPT=--include boot_dir/$kernel $::env(RUN_OPT_AUTOPILOT)" >> $build_conf
+	}
 }