diff --git a/ChangeLog b/ChangeLog
index ba67c6d609..784e1cdc7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf/cache.c (save_cache): Don't write beyond end of file_entries
+	buffer.
+	Duplicate last old cache entry if the count would be odd.
+
 2003-08-25  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/unix/sysv/linux/posix_fadvise64.c: Cast arguments of
diff --git a/libio/ioseekoff.c b/libio/ioseekoff.c
index 9383d71972..9229166705 100644
--- a/libio/ioseekoff.c
+++ b/libio/ioseekoff.c
@@ -53,12 +53,7 @@ _IO_seekoff_unlocked (fp, offset, dir, mode)
      callback may not know to do the right thing about it.
      This may be over-kill, but it'll do for now. TODO */
   if (mode != 0 && ((_IO_fwide (fp, 0) < 0 && _IO_have_backup (fp))
-		    || (
-#if defined _LIBC && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
-			__builtin_expect (&_IO_stdin_used != NULL, 1) &&
-#endif
-			_IO_fwide (fp, 0) > 0 && _IO_have_wbackup (fp))
-		    ))
+		    || (_IO_fwide (fp, 0) > 0 && _IO_have_wbackup (fp))))
     {
       if (dir == _IO_seek_cur && _IO_in_backup (fp))
 	{
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 7eb2612fe8..d2af0ad643 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,6 +1,8 @@
 2003-08-25  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/an_ES: Fix locale header information.
+	* locales/wa_BE: Likewise.
+	* locales/yi_US: Likewise.
 	Patch by Jordi Mallach <jordi@sindominio.net>.
 
 2003-08-14  Ulrich Drepper  <drepper@redhat.com>