diff --git a/Makefile b/Makefile
index 529b9048d97e..68ef80b30340 100644
--- a/Makefile
+++ b/Makefile
@@ -773,6 +773,9 @@ endef
 vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) vmlinux.o FORCE
 ifdef CONFIG_HEADERS_CHECK
 	$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
+endif
+ifdef CONFIG_SAMPLES
+	$(Q)$(MAKE) $(build)=samples
 endif
 	$(call vmlinux-modpost)
 	$(call if_changed_rule,vmlinux__)
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 7d16e6433302..c567f219191d 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -498,3 +498,5 @@ config FAULT_INJECTION_STACKTRACE_FILTER
 	select FRAME_POINTER
 	help
 	  Provide stacktrace filter for fault-injection capabilities
+
+source "samples/Kconfig"
diff --git a/samples/Kconfig b/samples/Kconfig
new file mode 100644
index 000000000000..b46b4cf4382f
--- /dev/null
+++ b/samples/Kconfig
@@ -0,0 +1,11 @@
+# samples/Kconfig
+
+menuconfig SAMPLES
+	bool "Sample kernel code"
+	help
+	  You can build and test sample kernel code here.
+
+if SAMPLES
+
+
+endif # SAMPLES