diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c952fa71bca0..a16f90442072 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-23  Benjamin Kosnik  <bkoz@redhat.com>
+
+	PR libstdc++/27984
+	* testsuite/lib/libstdc++.exp (libstdc++_init): Adjust
+	testing includes.
+	* docs/html/test.html: Adjust for testsuite changes.
+	
 2006-06-22  Jonathan Lennox  <lennox@cs.columbia.edu>
 	    Paolo Carlini  <pcarlini@suse.de>
 
diff --git a/libstdc++-v3/docs/html/test.html b/libstdc++-v3/docs/html/test.html
index 41e0529e6c69..0465503a4579 100644
--- a/libstdc++-v3/docs/html/test.html
+++ b/libstdc++-v3/docs/html/test.html
@@ -31,7 +31,7 @@
 <h2>Contents</h2>
 <ul>
    <li><a href="#org">Testsuite organization and naming conventions</a></li>
-   <li><a href="#util">Utilities: abicheck and libv3test</a></li>
+   <li><a href="#util">Utilities: abicheck and libtestc++</a></li>
    <li><a href="#new">How to write a new test case</a></li>
    <li><a href="#check">Options for running the tests</a></li>
    <li><a href="#debug">Running debug-mode tests</a></li>
@@ -93,6 +93,7 @@ config		  Files for the dejagnu test harness.
 lib		  Files for the dejagnu test harness.
 libstdc++*     	  Files for the dejagnu test harness.
 data		  Sample text files for testing input and output.
+util		  Files for libtestc++, utilities and testing routines.
    </pre>
 
    <p>
@@ -207,14 +208,14 @@ cat 27_io/objects/char/3_xin.in | a.out
 </ul>
 
 <hr />
-<h2><a name="util">Utilities: abi_check and libv3test</a></h2>
+<h2><a name="util">Utilities: abi_check and libtestc++</a></h2>
   <p>
    The testsuite directory also contains some files that implement
    functionality that is intended to make writing test cases easier,
    or to avoid duplication, or to provide error checking in a way that
    is consistent across platforms and test harnesses. A stand-alone
    executable, called <em>abi_check</em>, and a static library called
-   <em>libv3test</em> are constructed. Both of these items are not
+   <em>libtestc++</em> are constructed. Both of these items are not
    installed, and only used during testing.
   </p>
 
@@ -329,9 +330,9 @@ cat 27_io/objects/char/3_xin.in | a.out
    <p>
    A bunch of utility functions and classes have already been
    abstracted out into the testsuite utility library, <code>
-   libv3test</code>. To use this functionality, just include the
-   appropriate header file: the library will automatically be linked
-   in as part of the testsuite run.
+   libtestc++</code>. To use this functionality, just include the
+   appropriate header file: the library or specific object files will
+   automatically be linked in as part of the testsuite run.
    </p>
 
    <p>
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index d7da29f77c3d..d22648239ba1 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -172,9 +172,9 @@ proc libstdc++_init { testfile } {
     # Do a bunch of handstands and backflips for cross compiling and
     # finding simulators...
     if [is_remote host] {
-        set header [remote_download host ${blddir}/testsuite/testsuite_hooks.h]
+        set header [remote_download host ${blddir}/testsuite/util/testsuite_hooks.h]
         if { $header == "" } {
-            verbose -log "Unable to download ${blddir}/testsuite/testsuite_hooks.h to host."
+            verbose -log "Unable to download ${blddir}/testsuite/util/testsuite_hooks.h to host."
             return "untested"
         }
       set cxx [transform "g++"]
@@ -190,7 +190,7 @@ proc libstdc++_init { testfile } {
             set includes [exec sh $flags_file --build-includes]
         } else {
             set cxx [transform "g++"]
-            set includes "-I${srcdir}"
+            set includes "-I${srcdir}/util"
             set cxxldflags ""
             set cxxflags "-g -O2 -D_GLIBCXX_ASSERT -fmessage-length=0" 
         }