diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6ad872d33a..86c9f3b235 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -17,6 +17,9 @@ Wed Jul  5 20:17:14 1995  Ken Raeburn  <raeburn@cygnus.com>
 	back end data.  Also clean up some "gcc -Wall" warnings regarding
 	unused or uninitialized variables.
 
+	* Makefile.in (BFD_LIBS): No, don't put elflink.o here.
+	* configure.in: Include it here whenever elf.o is specified.
+
 Wed Jul  5 10:31:47 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* elf32-mips.c (mips_elf_object_p): Unconditionally set
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index f29f1158ad..c94c1db286 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -85,7 +85,7 @@ BFD_LIBS = \
 	archive.o archures.o bfd.o cache.o coffgen.o core.o \
 	format.o init.o libbfd.o opncls.o reloc.o \
 	section.o syms.o targets.o hash.o linker.o \
-	elf.o elflink.o srec.o binary.o tekhex.o 
+	elf.o srec.o binary.o tekhex.o 
 
 # This list is alphabetized to make it easier to keep in sync
 # with the decls and initializer in archures.c.