diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a1e35e0b1d..01987b1d05 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-26  Alan Modra  <amodra@bigpond.net.au>
+
+	* cache.c (bfd_cache_lookup_worker): Use bfd_error_handler
+	rather than bfd_perror.  Print file name.  Internationalise.
+
 2005-10-26  Alan Modra  <amodra@bigpond.net.au>
 
 	* cache.c (bfd_open_file): Set bfd_error_system_call on failure
diff --git a/bfd/cache.c b/bfd/cache.c
index e9f38ab6b4..88d0c98455 100644
--- a/bfd/cache.c
+++ b/bfd/cache.c
@@ -477,6 +477,7 @@ DESCRIPTION
 FILE *
 bfd_cache_lookup_worker (bfd *abfd)
 {
+  bfd *orig_bfd = abfd;
   if ((abfd->flags & BFD_IN_MEMORY) != 0)
     abort ();
 
@@ -501,7 +502,8 @@ bfd_cache_lookup_worker (bfd *abfd)
   else
     return (FILE *) abfd->iostream;
 
-  bfd_perror ("Cannot continue");
+  (*_bfd_error_handler) (_("reopening %B: %s\n"),
+			 orig_bfd, bfd_errmsg (bfd_get_error ()));
   abort ();
   return NULL;
 }