diff --git a/ChangeLog b/ChangeLog
index ebabab1a7c..83a55fe9bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-31  Andreas Jaeger  <aj@suse.de>
+
+	[BZ #1395]
+	* manual/filesys.texi (Symbolic Links): Fix description of
+	canonicalize_file_name based on patch by Oskar Liljeblad
+	<oskar@osk.mine.nu>.
+
 2005-12-29  Andreas Jaeger  <aj@suse.de>
 
 	* resolv/res_debug.c (latlon2ul): Use ISO C function declaration.
diff --git a/manual/filesys.texi b/manual/filesys.texi
index dbc97f2f12..c8ae377266 100644
--- a/manual/filesys.texi
+++ b/manual/filesys.texi
@@ -1250,10 +1250,10 @@ result is passed back as the return value of the function in a block of
 memory allocated with @code{malloc}.  If the result is not used anymore
 the memory should be freed with a call to @code{free}.
 
-In any of the path components except the last one is missing the
-function returns a NULL pointer.  This is also what is returned if the
-length of the path reaches or exceeds @code{PATH_MAX} characters.  In
-any case @code{errno} is set accordingly.
+If any of the path components is missing the function returns a NULL
+pointer.  This is also what is returned if the length of the path
+reaches or exceeds @code{PATH_MAX} characters.  In any case
+@code{errno} is set accordingly.
 
 @table @code
 @item ENAMETOOLONG