diff --git a/ChangeLog b/ChangeLog
index 6f68569b30..10a8016fe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2000-11-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* iconvdata/utf-16.c (PREPARE_LOOP): Correct typo preventing BOM from
+	being written.
+
+	* manual/socket.texi (Local Namespace Concepts): Don't mention what
+	permissions are necessary to connect to a socket.
+	Reported by Peter Eisentraut <peter_e@gmx.net>.
+
+	* sysdeps/generic/backtracesyms.c (__backtrace_symbols): Fix
+	computation of total for 64-bit machines.
+	Patch by Byron Stanoszek <gandalf@winds.org>.
+
+	* manual/arith.texi (Rounding): Correct description of fesetround
+	return value.  Patch by Conrado Badenas <Conrado.Badenas@uv.es>.
+
 2000-10-30  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
 
 	* sysdeps/mips/dl-machine.h (elf_machine_rel): Add the symbol's
diff --git a/iconvdata/utf-16.c b/iconvdata/utf-16.c
index aa0d00c119..91e3390cba 100644
--- a/iconvdata/utf-16.c
+++ b/iconvdata/utf-16.c
@@ -45,7 +45,7 @@
   enum direction dir = ((struct utf16_data *) step->__data)->dir;	      \
   enum variant var = ((struct utf16_data *) step->__data)->var;		      \
   int swap = ((struct utf16_data *) step->__data)->swap;		      \
-  if (FROM_DIRECTION || var == UTF_16)					      \
+  if (FROM_DIRECTION && var == UTF_16)					      \
     {									      \
       if (data->__invocation_counter == 0)				      \
 	{								      \
diff --git a/manual/socket.texi b/manual/socket.texi
index 4a7c411065..dbdb96eaf2 100644
--- a/manual/socket.texi
+++ b/manual/socket.texi
@@ -571,9 +571,10 @@ as file names.
 
 In the local namespace socket addresses are file names.  You can specify
 any file name you want as the address of the socket, but you must have
-write permission on the directory containing it.  In order to connect to
-a socket you must have read permission for it.  It's common to put
-these files in the @file{/tmp} directory.
+write permission on the directory containing it.
+@c XXX The following was said to be wrong.
+@c In order to connect to a socket you must have read permission for it.
+It's common to put these files in the @file{/tmp} directory.
 
 One peculiarity of the local namespace is that the name is only used
 when opening the connection; once open the address is not meaningful and
diff --git a/sysdeps/generic/backtracesyms.c b/sysdeps/generic/backtracesyms.c
index 76019eec3d..77988833d3 100644
--- a/sysdeps/generic/backtracesyms.c
+++ b/sysdeps/generic/backtracesyms.c
@@ -1,5 +1,5 @@
 /* Return list with names for address in backtrace.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -37,8 +37,8 @@ __backtrace_symbols (array, size)
   char **result;
 
   /* We can compute the text size needed for the symbols since we print
-     them all as "[%<addr>]".  */
-  total = size * (WORD_WIDTH + 3);
+     them all as "[+0x<addr>]".  */
+  total = size * (WORD_WIDTH + 6);
 
   /* Allocate memory for the result.  */
   result = malloc (size * sizeof (char *) + total);