diff --git a/ChangeLog b/ChangeLog
index f97ba3ea5..5a07c55c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,16 @@
-2006-04-18  Jim Meyering  <jim@meyering.net>
+2006-04-17  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* Version 6.0-cvs.
 
+	* src/chmod.c (describe_change): Adjust to filemode changes.
+	* src/ls.c (HAVE_ST_DM_MODE): Remove; moved to ../lib/filemode.c.
+	(print_long_format): Use (new) filemodestring rather than
+	(old) mode_string, so that we get more file types right, at least
+	in theory.  Adjust to filemode changes.
+	* src/stat.c (human_access): Likewise.
+
+2006-04-18  Jim Meyering  <jim@meyering.net>
+
 	* src/ptx.c (main) [DEFAULT_IGNORE_FILE]: Remove code to use a default
 	ignore file.  This has never been enabled.  Reported by Eric Blake.
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index d598abe60..69d9bc6be 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* coreutils.texi (What information is listed): Add P for Solaris
+	10 ports.  Add commented-out entries for other types that POSIX
+	says are possible, or that I observed in FreeBSD documentation.
+
 2006-04-18  Jim Meyering  <jim@meyering.net>
 
 	* coreutils.texi (Input processing in ptx): Remove mention of the
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 76d46940e..b5ebafdd0 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,23 @@
 2006-04-17  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* filemode.c: Include "filemode.h" first, to test the interface.
+	Assume that filemode.h includes sys/types.h and sys/stat.h.
+	(HAVE_ST_DM_MODE): New macro, moved here from ls.c.
+	(ftypelet): Reorder to put common cases first, for efficiency.
+	Add 'P', 'w'.  Remove 'M', since it's now the caller's responsibility
+	to do 'M'.
+	(strmode): Renamed from mode_string, and now stores 12 bytes instead
+	of 10, for compatibility with FreeBSD.  All callers changed.
+	(filemodestring): Now stores 12 bytes instead of 10, and sets file types
+	that can't be deduced solely from st_mode.  First arg is now a const
+	pointer.
+	* filemode.h (HAVE_DECL_STRMODE): Include <string.h> for strmode.
+	(strmode): Renamed from mode_string.
+	(filemodestring): New decl.
+	* stat-macros.h: Don't undef S_ISDOOR, since it's never buggy.
+	(S_ISDOOR): Don't bother with S_IFDOOR, since that code is never needed.
+	(S_ISPORT, S_ISWHT): New macros, if not already defined.
+
 	* openat.h (openat_needs_fchdir) [ ! defined __OPENAT_PREFIX]:
 	Turn this into a macro that always returns false.
 
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 0cf74323f..48fe348de 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* filemode.m4 (gl_FILEMODE): Check for strmode declaration.
+
 2006-04-12  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* jm-macros.m4 (gl_MACROS): Check for setgroups and sync, since they