diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b76ceba9cb8..e891a5d551d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug  6 12:28:38 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* ecoff.c (ecoff_slurp_armap): From Arne Henrik Juul
+	<arnej@kari.fm.unit.no>: Handle a COFF style armap.
+
 Fri Aug  6 09:59:45 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* hpux-core.c: Cast return value from bfd_zalloc.
diff --git a/bfd/ecoff.c b/bfd/ecoff.c
index f6450f52b79..685ab4e869d 100644
--- a/bfd/ecoff.c
+++ b/bfd/ecoff.c
@@ -3947,6 +3947,14 @@ ecoff_slurp_armap (abfd)
 
   bfd_seek (abfd, (file_ptr) -16, SEEK_CUR);
 
+  /* Irix 4.0.5F apparently can use either an ECOFF armap or a
+     standard COFF armap.  We could move the ECOFF armap stuff into
+     bfd_slurp_armap, but that seems inappropriate since no other
+     target uses this format.  Instead, we check directly for a COFF
+     armap.  */
+  if (strncmp (nextname, "/               ", 16) == 0)
+    return bfd_slurp_armap (abfd);
+
   /* See if the first element is an armap.  */
   if (strncmp (nextname, ecoff_backend (abfd)->armap_start,
 	       ARMAP_START_LENGTH) != 0