diff --git a/linux/from-6.17/linux.hash b/linux/from-6.17/linux.hash
index 77c1ba866d..75994f545c 100644
--- a/linux/from-6.17/linux.hash
+++ b/linux/from-6.17/linux.hash
@@ -1,3 +1,6 @@
+# From https://www.kernel.org/pub/linux/kernel/v7.x/sha256sums.asc
+sha256  bb7f6d80b387c757b7d14bb93028fcb90f793c5c0d367736ee815a100b3891f0  linux-7.0.tar.xz
+
 # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
 sha256  ce5c4f1205f9729286b569b037649591555f31ca1e03cc504bd3b70b8e58a8d5  linux-6.19.12.tar.xz
 sha256  a23c92faf3657385c2c6b5f4edd8f81b808907ebe603fa30699eae224da55f59  linux-6.18.22.tar.xz
diff --git a/package/linux-headers/7.0 b/package/linux-headers/7.0
new file mode 120000
index 0000000000..a4e1d3ec9c
--- /dev/null
+++ b/package/linux-headers/7.0
@@ -0,0 +1 @@
+../../linux/from-6.17
\ No newline at end of file
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index fd68c29ec4..366d17ad09 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -3,7 +3,7 @@ comment "Kernel Header Options"
 choice
 	prompt "Kernel Headers"
 	default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
-	default BR2_KERNEL_HEADERS_6_19
+	default BR2_KERNEL_HEADERS_7_0
 	help
 	  Select the kernel version to get headers from.
 
@@ -55,6 +55,10 @@ config BR2_KERNEL_HEADERS_6_18
 config BR2_KERNEL_HEADERS_6_19
 	bool "Linux 6.19.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19
+
+config BR2_KERNEL_HEADERS_7_0
+	bool "Linux 7.0.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0
 	select BR2_KERNEL_HEADERS_LATEST
 
 config BR2_KERNEL_HEADERS_VERSION
@@ -133,8 +137,12 @@ choice
 	  If your kernel headers are more recent than the latest version
 	  in the choice, then select the latest version.
 
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_7_0
+	bool "7.0.x or later"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_19
-	bool "6.19.x or later"
+	bool "6.19.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19
 
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_18
@@ -471,6 +479,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "6.12.81"	if BR2_KERNEL_HEADERS_6_12
 	default "6.18.22"	if BR2_KERNEL_HEADERS_6_18
 	default "6.19.12"	if BR2_KERNEL_HEADERS_6_19
+	default "7.0"		if BR2_KERNEL_HEADERS_7_0
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
 	default "custom"	if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
 	default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 51c5ae6f96..910cd103dc 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -676,6 +676,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19
 	bool
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19
 	select BR2_TOOLCHAIN_HEADERS_LATEST
 
 # This should be selected by the latest version, above, to indicate that
@@ -689,6 +693,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
 # stops affecting a value on the first matching default.
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST
 	string
+	default "7.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0
 	default "6.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19
 	default "6.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_18
 	default "6.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_17
diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
index 01c2371e15..9ca024f5b8 100644
--- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
@@ -173,8 +173,12 @@ choice
 	  If your toolchain uses headers newer than the latest version
 	  in the choice, then select the latest version.
 
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_7_0
+	bool "7.0.x or later"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0
+
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_19
-	bool "6.19.x or later"
+	bool "6.19.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_19
 
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_18