diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c36f574334..98706381e7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+Thu Sep  7 12:48:01 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (do_distclean): Remove config.h and stamp-h.
+	(Makefile): Just rebuild Makefile.
+	(config.h, stamp-h): New targets.
+	* configure.in: Create stamp-h when rebuilding config.h.
+	* configure: Rebuild.
+
 Wed Sep  6 15:00:33 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* configure.in: Call AC_CONFIG_HEADER.  Substitute
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 0279f0a54b..a70ef0fe80 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -375,7 +375,7 @@ do_clean: do_mostlyclean
 	rm -f libbfd.a TAGS bfd.h stmp-bfd.h ofiles \
 		elf32-target.h elf64-target.h
 do_distclean: do_clean
-	rm -f Makefile config.status config.cache
+	rm -f Makefile config.status config.cache config.h stamp-h
 
 # Should we remove $(srcdir)/libcoff.h $(srcdir)/libbfd.h $(srcdir)/bfd-in2.h?
 # make-stds.texi says it depends on whether they can be regenerated using
@@ -474,7 +474,11 @@ install:
 	fi
 
 Makefile: Makefile.in config.status
-	$(SHELL) config.status
+	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
+
+config.h: stamp-h ; @true
+stamp-h: config.h.in config.status
+	CONFIG_FILES= CONFIG_HEADERS=config.h $(SHELL) ./config.status
 
 config.status: configure configure.host config.bfd
 	$(SHELL) config.status --recheck
diff --git a/bfd/configure b/bfd/configure
index 64696be518..ec4e70f186 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -1706,7 +1706,7 @@ cat >> $CONFIG_STATUS <<\EOF
 fi; done
 
 
-
+case x$CONFIG_HEADERS in xconfig.h) echo > stamp-h ;; esac
 exit 0
 EOF
 chmod +x $CONFIG_STATUS
diff --git a/bfd/configure.in b/bfd/configure.in
index 7bfe2a1d9b..39eea25802 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -480,4 +480,5 @@ test -n "${selarchs}" && tdefaults="${tdefaults} -DSELECT_ARCHITECTURES='${selar
 AC_SUBST(tdefaults)
 
 rm -f doc/config.status
-AC_OUTPUT(Makefile doc/Makefile)
+AC_OUTPUT(Makefile doc/Makefile,
+[case x$CONFIG_HEADERS in xconfig.h) echo > stamp-h ;; esac])