diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a6dc0f1ceb4..9d14062f988 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -2,6 +2,11 @@
 
 	* testsuite/26_numerics/c99_classification_macros_c.cc: Add XFAIL.
 
+	* include/std/std_bitset.h (_M_do_find_next): Fix -Wall nit.
+	* include/bits/concept_check.h: Fix multi-line comment.
+	* testsuite/17_intro/headers.cc (dg-options): Add -Wall -Wsystem-header
+	when target is *-*-freebsd*.
+
 2003-04-14  Nathan Myers  <ncm@cantrip.org>
             Paolo Carlini  <pcarlini@unitus.it>
 
diff --git a/libstdc++-v3/include/bits/concept_check.h b/libstdc++-v3/include/bits/concept_check.h
index 92ceefbd685..88877ebf57e 100644
--- a/libstdc++-v3/include/bits/concept_check.h
+++ b/libstdc++-v3/include/bits/concept_check.h
@@ -61,8 +61,7 @@
 
 // Note that the obvious and elegant approach of
 //
-//#define glibcpp_function_requires(C)      \
-//            boost::function_requires< boost::C >()
+//#define glibcpp_function_requires(C) boost::function_requires< boost::C >()
 //
 // won't work due to concept templates with more than one parameter, e.g.,
 // BinaryPredicateConcept.  The preprocessor tries to split things up on
diff --git a/libstdc++-v3/include/std/std_bitset.h b/libstdc++-v3/include/std/std_bitset.h
index f390ce66c88..c6e993a3e79 100644
--- a/libstdc++-v3/include/std/std_bitset.h
+++ b/libstdc++-v3/include/std/std_bitset.h
@@ -414,7 +414,7 @@ namespace std
       _M_do_find_next(size_t __prev, size_t __not_found) const
       {
 	++__prev;
-	if (__prev >= _GLIBCPP_BITSET_BITS_PER_WORD)
+	if (__prev >= ((size_t) _GLIBCPP_BITSET_BITS_PER_WORD))
 	  return __not_found;
 
 	_WordT __x = _M_w >> __prev;
diff --git a/libstdc++-v3/testsuite/17_intro/headers.cc b/libstdc++-v3/testsuite/17_intro/headers.cc
index eb930f1ff00..4694079ed29 100644
--- a/libstdc++-v3/testsuite/17_intro/headers.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers.cc
@@ -18,6 +18,9 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
+// FreeBSD wants warning clean system headers:
+// { dg-options "-Wall -Wsystem-headers" { target *-*-freebsd* } }
+
 // 17.4.1.2 Headers