diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f8cb182ee24..3dba391716f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -9,6 +9,7 @@
 
 	* include/ext/array_allocator.h (array_allocator<>::allocate):
 	Avoid __used.  Use __array_used instead.
+	* docs/html/17_intro/BADNAMES: Add list for FreeBSD.
 
 2005-01-18  David Edelsohn  <edelsohn@gnu.org>
 
diff --git a/libstdc++-v3/docs/html/17_intro/BADNAMES b/libstdc++-v3/docs/html/17_intro/BADNAMES
index 0a1d7a4e90a..575284eaa93 100644
--- a/libstdc++-v3/docs/html/17_intro/BADNAMES
+++ b/libstdc++-v3/docs/html/17_intro/BADNAMES
@@ -1,9 +1,9 @@
 
-This is the list of names "reserved to the implementation" 
-that have been claimed by certain compilers of interest, and
-should not be used in the library.  It will grow, of course.
-We generally are interested in names that are not all-caps,
-except for those like "_T"
+This is the list of names "reserved to the implementation" that
+have been claimed by certain compilers and system headers of interest,
+and should not be used in the library.  It will grow, of course.
+We generally are interested in names that are not all-caps, except
+for those like "_T"
 
 For Solarix:
 _B
@@ -25,6 +25,20 @@ _G
 MS adds:
 _T
 
+BSD adds:
+__used
+__inline
+_Complex
+__istype
+__maskrune
+__tolower
+__toupper
+__wchar_t
+__wint_t
+_res
+_res_ext
+__tg_*
+
 For GCC:
 
   [Note that this list is out of date.  It applies to the old