diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9c80dcd2665..3c0e68749ea 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-02  Alex Samuel  <samuel@codesourcery.com>
+
+	* Makefile.in (gcc_gxx_target_include_dir): Generate dynamically
+	as for gcc_gxx_include_dir.
+
 2001-02-02  Neil Booth  <neil@daikokuya.demon.co.uk>
 
 	* cpp.texi, invoke.texi: Update -Wtraditional documentation.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index d3116493a05..17255c79b18 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -319,7 +319,7 @@ build_tooldir = $(exec_prefix)/$(target_alias)
 # Directory in which the compiler finds target-independent g++ includes.
 gcc_gxx_include_dir = @gcc_gxx_include_dir@
 # Directory in which the compiler finds target-dependent g++ includes.
-gcc_gxx_target_include_dir = $(build_tooldir)/include/@libstdcxx_incdir@
+gcc_gxx_target_include_dir = $(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/$(target)/include/@libstdcxx_incdir@
 # Directory to search for site-specific includes.
 includedir = $(local_prefix)/include
 # assertdir is overridden in cross-make.