diff --git a/ChangeLog b/ChangeLog
index c085c9b637..b0c2047b80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makeconfig ($(common-objpfx)dl-tunable-list.h): Also check
+	dl-tunables.list in subdirectories.
+
 2017-05-25  Paul E. Murphy  <murphyp@linux.vnet.ibm.com>
 	    Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
 	    Tulio Magno Quites Machado Filho  <tuliom@linux.vnet.ibm.com>
diff --git a/Makeconfig b/Makeconfig
index b494b82b40..e4eda4bcdf 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1127,7 +1127,9 @@ ifneq (no,$(have-tunables))
 before-compile += $(common-objpfx)dl-tunable-list.h
 
 $(common-objpfx)dl-tunable-list.h: $(..)scripts/gen-tunables.awk \
-				   $(..)elf/dl-tunables.list
+				   $(..)elf/dl-tunables.list \
+				   $(wildcard $(subdirs:%=$(..)%/dl-tunables.list)) \
+				   $(wildcard $(sysdirs:%=%/dl-tunables.list))
 	$(AWK) -f $^ > $@.tmp
 	mv $@.tmp $@
 endif