diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 99da14d6b0..b42d6cf204 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+Sat Oct 29 12:18:10 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* linker.c (_bfd_generic_link_add_archive_symbols): It's not an
+	error if an empty archive has no symbol table.
+	* ecoff.c (ecoff_link_add_archive_symbols): Likewise.
+	* elfcode.h (elf_link_add_archive_symbols): Likewise.
+
 Fri Oct 28 10:08:41 1994  J.T. Conklin  (jtc@rtl.cygnus.com)
 
         NetBSD/m68k support, based on work by mikeb@snow.datametrics.com: 
diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index cdb51afda8..d3b477f681 100644
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -3738,6 +3738,9 @@ elf_link_add_archive_symbols (abfd, info)
 
   if (! bfd_has_map (abfd))
     {
+      /* An empty archive is a special case.  */
+      if (bfd_openr_next_archived_file (abfd, (bfd *) NULL) == NULL)
+	return true;
       bfd_set_error (bfd_error_no_symbols);
       return false;
     }