diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1849b11ea34..f6dcbdc472d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-11  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* testsuite/lib/libstdc++.exp (libstdc++_init): Revert part of
+	2007-09-06 change.
+
 2007-09-09  Roger Sayle  <roger@eyesopen.com>
 
 	* acinclude.m4 (GLIBCXX_CHECK_SYSTEM_ERROR): Add ECANCELED for cygwin.
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index cc24fc9afbd..460330527fd 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -171,6 +171,13 @@ proc libstdc++_init { testfile } {
 	set compiler [transform "g++"]
     }
 
+    # Default settings.
+    set cxx [transform "g++"]
+    set cxxflags "-g -O2 -D_GLIBCXX_ASSERT -fmessage-length=0"
+    set cxxldflags ""
+    set cc [transform "gcc"]
+    # Locate testsuite_hooks.h and other testsuite headers.
+    set includes "-I${srcdir}/util"
     # Adapt the defaults for special circumstances.
     if [is_remote host] {
 	# A remote host does not, in general, have access to the
@@ -199,12 +206,6 @@ proc libstdc++_init { testfile } {
 		return "untested"
 	    }
 	}
-	# Default settings.
-	set cxx [transform "g++"]
-	set cxxflags "-g -O2 -D_GLIBCXX_ASSERT -fmessage-length=0 " 
-	set cxxldflags ""
-	set cc [transform "gcc"]
-	# Locate testsuite_hooks.h and other testsuite headers.	
 	set includes "-Iutil"
     } elseif { [file exists $flags_file] } {
         # If we find a testsuite_flags file, we're testing in the build dir.