diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 599d2d735b..cceffd70c3 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-11  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf64-ppc.c (edit_opd): Only zero opd syms when function is
+	completely removed.
+
 2002-10-10  Stephen Clarke <stephen.clarke@superh.com>
 
 	* elf32-sh.c (elf_sh_pic_plt_entry_be, elf_sh_pic_plt_entry_le):
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 37b30e6278..909314f082 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -3762,7 +3762,7 @@ edit_opd (obfd, info)
 			  || sym_sec->output_section == bfd_abs_section_ptr);
 		  if (skip)
 		    {
-		      if (h != NULL)
+		      if (h != NULL && sym_sec->owner == ibfd)
 			{
 			  /* Arrange for the function descriptor sym
 			     to be dropped.  */