diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5606bf232d8074fc40d24ea85aa30d6f496b2776..0536648bd2ed8b308ea423d2d1f12e198cc967aa 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-29  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* testsuite/lib/libstdc++.exp (v3_target_compile): Set timeout to
+	600.
+
 2006-06-27  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* testsuite/util/regression/rand/priority_queue/
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index d22648239ba1deadd4123a06544b28454fde7e3c..b8c7215898d41f2678ad7aab657913d020d34d47 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -348,6 +348,7 @@ proc v3_target_compile { source dest type options } {
     }
 
     lappend options "compiler=$cxx_final"
+    lappend options "timeout=600"
 
     return [target_compile $source $dest $type $options]
 }