diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 88f7d858f54..ddd9d58f16a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-28  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/parallel/algorithmfwd.h: Spacing.
+	* include/parallel/tags.h: Correct comment.
+	
+	* testsuite/Makefile.am (AM_MAKEFLAGS, AM_RUNTESTFLAGS): Remove.
+	* testsuite/Makefile.in: Regenerate.
+	
 2007-09-27  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* testsuite/util/testsuite_hooks.cc (set_memory_limits): Adjust
diff --git a/libstdc++-v3/include/parallel/algorithmfwd.h b/libstdc++-v3/include/parallel/algorithmfwd.h
index 319091904cd..aa3c5585b26 100644
--- a/libstdc++-v3/include/parallel/algorithmfwd.h
+++ b/libstdc++-v3/include/parallel/algorithmfwd.h
@@ -149,7 +149,7 @@ namespace __parallel
 
   template<typename _IIter, typename Predicate>
   inline _IIter
-  find_if (_IIter, _IIter, Predicate);
+  find_if(_IIter, _IIter, Predicate);
 
   template<typename _IIter, typename Predicate, typename IteratorTag>
   inline _IIter
diff --git a/libstdc++-v3/include/parallel/tags.h b/libstdc++-v3/include/parallel/tags.h
index 80926b44384..438b1647509 100644
--- a/libstdc++-v3/include/parallel/tags.h
+++ b/libstdc++-v3/include/parallel/tags.h
@@ -121,4 +121,4 @@ namespace __gnu_parallel
   struct equal_split_tag { };
 }
 
-#endif /* _GLIBCXX_TAGS_H */
+#endif /* _GLIBCXX_PARALLEL_TAGS_H */
diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index 4a4dc442dd3..66bb6df5ac2 100644
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile for the testsuite subdirectory of the GNU C++ Standard library.
 ##
-## Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
 ##
 ## This file is part of the libstdc++ version 3 distribution.
 ## Process this file with automake to produce Makefile.in.
@@ -25,9 +25,6 @@ AUTOMAKE_OPTIONS = dejagnu nostdinc
 
 include $(top_srcdir)/fragment.am
 
-AM_MAKEFLAGS = -j1
-AM_RUNTESTFLAGS =
-
 # Generated lists of files to run.  All of these names are valid make
 # targets, if you wish to generate a list manually.
 lists_of_files = \
@@ -143,7 +140,7 @@ check-parallel: site.exp
 	fi; \
 	srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
 	EXPECT=$(EXPECT); export EXPECT; \
-	$(MAKE) CXXFLAGS="$(atomic_flags) $(libgomp_flags)" $(AM_MAKEFLAGS) RUNTESTFLAGS="$(RUNTESTFLAGS) conformance.exp --outdir $${outputdir} --objdir $${outputdir} --target_board=$(parallel_flags)" check-DEJAGNU; )
+	$(MAKE) CXXFLAGS="$(atomic_flags) $(libgomp_flags)" RUNTESTFLAGS="$(RUNTESTFLAGS) conformance.exp --outdir $${outputdir} --objdir $${outputdir} --target_board=$(parallel_flags)" check-DEJAGNU; )
 
 check-performance-parallel: testsuite_files_performance ${performance_script}
 	-@(chmod + ${check_performance_script}; \
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index b76a5ed194e..4b107c01c2a 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -277,8 +277,6 @@ WARN_CXXFLAGS = \
 
 # -I/-D flags to pass when compiling.
 AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
-AM_MAKEFLAGS = -j1
-AM_RUNTESTFLAGS = 
 
 # Generated lists of files to run.  All of these names are valid make
 # targets, if you wish to generate a list manually.
@@ -581,7 +579,7 @@ check-parallel: site.exp
 	fi; \
 	srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
 	EXPECT=$(EXPECT); export EXPECT; \
-	$(MAKE) CXXFLAGS="$(atomic_flags) $(libgomp_flags)" $(AM_MAKEFLAGS) RUNTESTFLAGS="$(RUNTESTFLAGS) conformance.exp --outdir $${outputdir} --objdir $${outputdir} --target_board=$(parallel_flags)" check-DEJAGNU; )
+	$(MAKE) CXXFLAGS="$(atomic_flags) $(libgomp_flags)" RUNTESTFLAGS="$(RUNTESTFLAGS) conformance.exp --outdir $${outputdir} --objdir $${outputdir} --target_board=$(parallel_flags)" check-DEJAGNU; )
 
 check-performance-parallel: testsuite_files_performance ${performance_script}
 	-@(chmod + ${check_performance_script}; \