diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 146c68cae3..99ff228cf7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,9 @@
 Mon Jan 15 14:29:44 1996  Ian Lance Taylor  <ian@cygnus.com>
 
+	* coffgen.c (coff_find_nearest_line): Don't try to cache
+	information in sections that are not owned by a BFD.  From Richard
+	Henderson <richard@atheist.tamu.edu>.
+
 	* elf32-mips.c: Numerous changes to dynamic linking code, mostly
 	from Kazumoto Kojima <kkojima@info.kanagawa-u.ac.jp>.
 	* elflink.h (elf_link_output_extsym): Remove special check for
diff --git a/bfd/coffgen.c b/bfd/coffgen.c
index 7ad5b6f4c0..3797ec8c23 100644
--- a/bfd/coffgen.c
+++ b/bfd/coffgen.c
@@ -81,10 +81,8 @@ make_a_section_from_file (abfd, hdr, target_index)
   if (return_section == NULL)
     return false;
 
-  /* s_paddr is presumed to be = to s_vaddr */
-
   return_section->vma = hdr->s_vaddr;
-  return_section->lma = return_section->vma;
+  return_section->lma = hdr->s_paddr;
   return_section->_raw_size = hdr->s_size;
   return_section->filepos = hdr->s_scnptr;
   return_section->rel_filepos = hdr->s_relptr;
@@ -2076,7 +2074,7 @@ coff_find_nearest_line (abfd, section, ignore_symbols, offset, filename_ptr,
     }
 
   /* Cache the results for the next call.  */
-  if (sec_data == NULL)
+  if (sec_data == NULL && section->owner == abfd)
     {
       section->used_by_bfd =
 	((PTR) bfd_zalloc (abfd,