diff --git a/ChangeLog b/ChangeLog
index 0b07992533..4f410ed888 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-19  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.tpl, configure.in: Substitute libstdcxx_incdir.
+	* Makefile.in: Regenerate.
+
 2002-12-18  H.J. Lu <hjl@gnu.org>
 
 	* Makefile.tpl: Add @build_prefix@ before $(BUILD_SUBDIR).
diff --git a/Makefile.in b/Makefile.in
index a2265d4b61..4466ec8416 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,7 +69,8 @@ includedir = @includedir@
 oldincludedir = @oldincludedir@
 infodir = @infodir@
 mandir = @mandir@
-gxx_include_dir=@gxx_include_dir@
+gxx_include_dir = @gxx_include_dir@
+libstdcxx_incdir = @libstdcxx_incdir@
 
 tooldir = @tooldir@
 build_tooldir = @build_tooldir@
diff --git a/Makefile.tpl b/Makefile.tpl
index d656c5065d..de5291f54d 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -72,7 +72,8 @@ includedir = @includedir@
 oldincludedir = @oldincludedir@
 infodir = @infodir@
 mandir = @mandir@
-gxx_include_dir=@gxx_include_dir@
+gxx_include_dir = @gxx_include_dir@
+libstdcxx_incdir = @libstdcxx_incdir@
 
 tooldir = @tooldir@
 build_tooldir = @build_tooldir@
diff --git a/configure.in b/configure.in
index fb379fcfda..8276a4586d 100644
--- a/configure.in
+++ b/configure.in
@@ -1736,6 +1736,7 @@ s%@build_subdir@%${build_subdir}%
 s%@build_prefix@%${build_prefix}%
 s%@build_configargs@%${buildargs}%
 s%@gxx_include_dir@%${gxx_include_dir}%
+s%@libstdcxx_incdir@%${libstdcxx_incdir}%
 s%@host_configargs@%${hostargs}%
 EOF
 sed -f $sedtemp Makefile > Makefile.tem