diff --git a/buildroot/package/linux-headers/Config.in.host b/buildroot/package/linux-headers/Config.in.host
index 34604acac..ee95b544f 100644
--- a/buildroot/package/linux-headers/Config.in.host
+++ b/buildroot/package/linux-headers/Config.in.host
@@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS
 choice
 	prompt "Kernel Headers"
 	default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
-	default BR2_KERNEL_HEADERS_4_17
+	default BR2_KERNEL_HEADERS_4_16
 	help
 	  Select the kernel version to get headers from.
 
@@ -71,10 +71,6 @@ config BR2_KERNEL_HEADERS_4_16
 	bool "Linux 4.16.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
 
-config BR2_KERNEL_HEADERS_4_17
-	bool "Linux 4.16.x kernel headers"
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
-
 config BR2_KERNEL_HEADERS_VERSION
 	bool "Manually specified Linux version"
 
@@ -97,10 +93,6 @@ choice
 	  This is used to hide/show some packages that have strict
 	  requirements on the version of kernel headers.
 
-config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17
-	bool "4.17.x"
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
-
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16
 	bool "4.16.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
@@ -267,5 +259,4 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "4.14.56"	if BR2_KERNEL_HEADERS_4_14
 	default "4.15.18"	if BR2_KERNEL_HEADERS_4_15
 	default "4.16.17"	if BR2_KERNEL_HEADERS_4_16
-	default "4.17.12"	if BR2_KERNEL_HEADERS_4_17
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/buildroot/toolchain/Config.in b/buildroot/toolchain/Config.in
index f2d5a0095..ebd84509f 100644
--- a/buildroot/toolchain/Config.in
+++ b/buildroot/toolchain/Config.in
@@ -341,15 +341,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
 	bool
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
 
-config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
-	bool
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
-
 # 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 "4.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
 	default "4.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
 	default "4.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
 	default "4.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14