diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index ad04d6459e..b2468341ff 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -217,10 +217,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
 	bool
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
 
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
+
 # This order guarantees that the highest version is set, as kconfig
 # stops affecting a value on the first matching default.
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST
 	string
+	default "3.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
 	default "3.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
 	default "3.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
 	default "3.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 66166dd4f6..2e9352bc21 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -1038,6 +1038,10 @@ choice
 	    m = ( LINUX_VERSION_CODE >> 8  ) & 0xFF
 	    p = ( LINUX_VERSION_CODE >> 0  ) & 0xFF
 
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_18
+	bool "3.18.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
+
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_17
 	bool "3.17.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17