diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3ceb6050f2..dc929b6b76 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-27  Michael Chastain  <mec.gnu@mindspring.com>
+
+	* Makefile.am (bfdver.h): Use explicit filename, not $< .
+	* Makefile.in: Regenerate.
+
 2004-05-27  Alexandre Oliva  <aoliva@redhat.com>
 
 	* elf-m10300.c (elf32_mn10300_finish_hash_table_entry): Avoid
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index b9f13a2b45..400a8207e1 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -869,15 +869,15 @@ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES)
 config.status: $(srcdir)/configure $(srcdir)/config.bfd $(srcdir)/configure.host
 	$(SHELL) ./config.status --recheck
 
-bfdver.h: version.h Makefile.in
+bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
 	@echo "creating $@"
 	@bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
 	bfd_version_string="\"$(VERSION)\"" ;\
 	if test "x$(RELEASE)" = x ; then \
-	  bfd_version_date=`sed -n -e 's/.*DATE //p' < $<` ;\
+	  bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
 	  bfd_version_string="\"$(VERSION) $${bfd_version_date}\"" ;\
 	fi ;\
-	sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" < $< > $@
+	sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" < $(srcdir)/version.h > $@
 
 # What appears below is generated by a hacked mkdep using gcc -MM.
 
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index f6049fc171..a270911794 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -1402,15 +1402,15 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES)
 config.status: $(srcdir)/configure $(srcdir)/config.bfd $(srcdir)/configure.host
 	$(SHELL) ./config.status --recheck
 
-bfdver.h: version.h Makefile.in
+bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
 	@echo "creating $@"
 	@bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
 	bfd_version_string="\"$(VERSION)\"" ;\
 	if test "x$(RELEASE)" = x ; then \
-	  bfd_version_date=`sed -n -e 's/.*DATE //p' < $<` ;\
+	  bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
 	  bfd_version_string="\"$(VERSION) $${bfd_version_date}\"" ;\
 	fi ;\
-	sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" < $< > $@
+	sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" < $(srcdir)/version.h > $@
 
 # What appears below is generated by a hacked mkdep using gcc -MM.