diff --git a/Config.in.legacy b/Config.in.legacy
index 806e995bd1..95b9d784d3 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2022.05"
 
+config BR2_KERNEL_HEADERS_5_16
+	bool "kernel headers version 5.16.x are no longer supported"
+	select BR2_LEGACY
+	help
+	  Version 5.16.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed.
+
 config BR2_KERNEL_HEADERS_4_4
 	bool "kernel headers version 4.4.x are no longer supported"
 	select BR2_LEGACY
diff --git a/linux/linux.hash b/linux/linux.hash
index 2a96eef8d3..3190813a0c 100644
--- a/linux/linux.hash
+++ b/linux/linux.hash
@@ -1,6 +1,5 @@
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
 sha256  22f67ef6b12ef6c0c0353be4b90b4bf4b9b18b858c16c346fa495b67ec718c99  linux-5.17.7.tar.xz
-sha256  d8060dc88f862baaae66b42a2dbc12298ed667c698eb5c55617a7786ee47bf25  linux-5.16.20.tar.xz
 sha256  888641634f9e0e38cd0efcfec92ea3c126d381b24a514740d3fe3dc9988fd7ad  linux-5.15.39.tar.xz
 sha256  f5e417b32f89318b6d0a230109a592ffd68997817463dc4692fa49ec7fe42f71  linux-5.10.115.tar.xz
 sha256  0d16d343956d311e3f4ab3f032fd626d8e6b67c0db94edd32f561407d374f2a0  linux-5.4.193.tar.xz
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 5ff616fb34..afe849772a 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -56,10 +56,6 @@ config BR2_KERNEL_HEADERS_5_15
 	bool "Linux 5.15.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15
 
-config BR2_KERNEL_HEADERS_5_16
-	bool "Linux 5.16.x kernel headers"
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16
-
 config BR2_KERNEL_HEADERS_5_17
 	bool "Linux 5.17.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
@@ -389,7 +385,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "5.4.193"	if BR2_KERNEL_HEADERS_5_4
 	default "5.10.115"	if BR2_KERNEL_HEADERS_5_10
 	default "5.15.39"	if BR2_KERNEL_HEADERS_5_15
-	default "5.16.20"	if BR2_KERNEL_HEADERS_5_16
 	default "5.17.7"	if BR2_KERNEL_HEADERS_5_17
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
 	default "custom"	if BR2_KERNEL_HEADERS_CUSTOM_TARBALL