diff --git a/Config.in b/Config.in
index 0799cb7e56..8ff725a426 100644
--- a/Config.in
+++ b/Config.in
@@ -280,10 +280,6 @@ config BR2_DEPRECATED
 
 if BR2_DEPRECATED
 
-config BR2_DEPRECATED_SINCE_2013_08
-	bool
-	default y
-
 config BR2_DEPRECATED_SINCE_2013_11
 	bool
 	default y
diff --git a/Config.in.legacy b/Config.in.legacy
index c6bb2fe342..a2c7846bdc 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -101,6 +101,16 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2014.08"
 
+config BR2_KERNEL_HEADERS_3_8
+	bool "kernel headers version 3.8.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_9
+	select BR2_LEGACY
+	help
+	  Version 3.8.x of the Linux kernel headers have been deprecated
+	  for more than four buildroot releases and are now removed.
+	  As an alternative, version 3.9.x of the headers have been
+	  automatically selected in your configuration.
+
 config BR2_PACKAGE_GETTEXT_TOOLS
 	bool "support for gettext-tools on target has been removed"
 	select BR2_LEGACY
@@ -131,7 +141,7 @@ config BR2_PACKAGE_EVTEST_CAPTURE
 
 config BR2_KERNEL_HEADERS_3_6
 	bool "kernel headers version 3.6.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_8
+	select BR2_KERNEL_HEADERS_3_9
 	select BR2_LEGACY
 	help
 	  Version 3.6.x of the Linux kernel headers have been deprecated
@@ -141,7 +151,7 @@ config BR2_KERNEL_HEADERS_3_6
 
 config BR2_KERNEL_HEADERS_3_7
 	bool "kernel headers version 3.7.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_8
+	select BR2_KERNEL_HEADERS_3_9
 	select BR2_LEGACY
 	help
 	  Version 3.7.x of the Linux kernel headers have been deprecated
@@ -326,7 +336,7 @@ config BR2_KERNEL_HEADERS_3_3
 
 config BR2_KERNEL_HEADERS_3_5
 	bool "kernel headers version 3.5.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_8
+	select BR2_KERNEL_HEADERS_3_9
 	select BR2_LEGACY
 	help
 	  Version 3.5.x of the Linux kernel headers have been deprecated
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index a9d42ca10d..7b674bb6dc 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -26,11 +26,6 @@ choice
 		depends on !BR2_arc
 		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
 
-	config BR2_KERNEL_HEADERS_3_8
-		bool "Linux 3.8.x kernel headers"
-		depends on BR2_DEPRECATED_SINCE_2013_08 && !BR2_arc
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8
-
 	config BR2_KERNEL_HEADERS_3_9
 		bool "Linux 3.9.x kernel headers"
 		depends on BR2_DEPRECATED_SINCE_2013_11
@@ -155,7 +150,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "3.0.101"	if BR2_KERNEL_HEADERS_3_0
 	default "3.2.60"	if BR2_KERNEL_HEADERS_3_2
 	default "3.4.93"	if BR2_KERNEL_HEADERS_3_4
-	default "3.8.13"	if BR2_KERNEL_HEADERS_3_8
 	default "3.9.11"	if BR2_KERNEL_HEADERS_3_9
 	default "3.10.43"	if BR2_KERNEL_HEADERS_3_10
 	default "3.11.10"	if BR2_KERNEL_HEADERS_3_11