diff --git a/ChangeLog b/ChangeLog
index 6d1c2c37c1..e0ee4faab9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2003-01-13  Ulrich Drepper  <drepper@redhat.com>
+
+	* locale/programs/charmap-dir.c (charmap_readdir): Use struct
+	dirent64 instead of struct dirent for dirent.  Call readdir64
+	instead of readdir.
+
+	* locale/programs/locfile.c (siblings_uncached): Use struct
+	dirent64 instead of struct dirent for other_dentry.  Call
+	readdir64 instead of readdir.
+
+	* elf/ldconfig.c (direntry): Change type to struct dirent64.
+	(search_dir): Use readdir64 instead of readdir.
+	Patch by Zhangfan Xing <xing@pacific.jpl.nasa.gov>.
+
 2003-01-12  Roland McGrath  <roland@redhat.com>
 
 	* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Use strtoul,
diff --git a/NEWS b/NEWS
index 83c1b9eb6d..890bcdc98b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-GNU C Library NEWS -- history of user-visible changes.  2002-12-2
-Copyright (C) 1992-2001, 2002 Free Software Foundation, Inc.
+GNU C Library NEWS -- history of user-visible changes.  2003-1-12
+Copyright (C) 1992-2002, 2003 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send GNU C library bug reports using the `glibcbug' script to
@@ -33,6 +33,17 @@ Version 2.3.2
 
 * The `btowc' function should work at least twice as fast due to
   specialized callbacks in the iconv modules.  Implemented by Bruno Haible.
+
+* With approriate thread add-ons cancelable functions are now implemented
+  in libc.so as well.  No need to call the function in libpthread.  This
+  change allowed to finally disable the incorrect and expensive handling
+  of weak definition in ld.so.
+
+* Yet more PLT entries in libc.so have been removed.  We finally arrived
+  at the bare minimum.  Startup times improved appropriately.
+
+* Support for the new Linux/x86 system call interface was added.  The
+  AT_SYSINFO auxiliary vector entry is recognized and handled.
 
 Version 2.3
 
diff --git a/locale/programs/charmap-dir.c b/locale/programs/charmap-dir.c
index 935f662ff6..903bd5cabc 100644
--- a/locale/programs/charmap-dir.c
+++ b/locale/programs/charmap-dir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -88,13 +88,13 @@ charmap_readdir (CHARMAP_DIR *cdir)
 {
   for (;;)
     {
-      struct dirent *dirent;
+      struct dirent64 *dirent;
       size_t len;
       size_t size;
       char *filename;
       mode_t mode;
 
-      dirent = readdir (cdir->dir);
+      dirent = readdir64 (cdir->dir);
       if (dirent == NULL)
         return NULL;
       if (strcmp (dirent->d_name, ".") == 0)
diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c
index c5e5581ac5..1e8e434ee1 100644
--- a/locale/programs/locfile.c
+++ b/locale/programs/locfile.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
@@ -389,12 +389,12 @@ siblings_uncached (const char *output_path)
   elems = NULL;
   for (;;)
     {
-      struct dirent *other_dentry;
+      struct dirent64 *other_dentry;
       const char *other_name;
       char *other_path;
       struct stat other_stat;
 
-      other_dentry = readdir (dirp);
+      other_dentry = readdir64 (dirp);
       if (other_dentry == NULL)
 	break;