diff --git a/Makeconfig b/Makeconfig
index 3ee4ece1fd..b721c4b877 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -182,7 +182,7 @@ endif
 
 # Where to install the header files.
 ifndef includedir
-includedir = $(exec_prefix)/include
+includedir = $(prefix)/include
 endif
 inst_includedir = $(install_root)$(includedir)
 
diff --git a/config.make.in b/config.make.in
index 30167e6fb1..d1f8409bb1 100644
--- a/config.make.in
+++ b/config.make.in
@@ -17,6 +17,7 @@ sysconfdir = @libc_cv_sysconfdir@
 libexecdir = @libexecdir@
 rootsbindir = @libc_cv_rootsbindir@
 infodir = @infodir@
+includedir = @includedir@
 
 # Should we use and build ldconfig?
 use-ldconfig = @use_ldconfig@