diff --git a/ChangeLog b/ChangeLog
index c0add6824..3d2451660 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-08  Phil Edwards  <pme@gcc.gnu.org>
+
+	* configure.in (gxx_include_dir):  Change to match versioned
+	C++ headers if --enable-version-specific-runtime-libs is used.
+
 2002-07-04  Steve Ellcey  <sje@cup.hp.com>
 
 	* ltcf-cxx.sh (hpux*): Modify to support ia64-*-hpux*.
diff --git a/configure.in b/configure.in
index 23617309c..24d63dea2 100644
--- a/configure.in
+++ b/configure.in
@@ -1445,7 +1445,7 @@ if test -n "${with_gxx_include_dir}"; then
 fi
 if test x${gxx_include_dir} = x; then
   if test x${enable_version_specific_runtime_libs} = xyes; then
-    gxx_include_dir='${libsubdir}/include/g++'
+    gxx_include_dir='${libsubdir}/include/c++'
   else
     . ${srcdir}/config.if
     gxx_include_dir='${prefix}/include/${libstdcxx_incdir}'