diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 763cc2d87730..5887f129693f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Fri May 29 00:57:37 1998  Bruce Korb <korbb@datadesign.com>
+
+	* Makefile.in (cstamp-h.in): Remove before trying to recreate.
+	(fixinc.sh): Set some additional environment variables before
+	calling mkfixinc.sh.
+
 Thu May 28 12:57:05 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* reload.c (find_reloads): Do not force a reloads of match_operators.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 7d9ef0ec0534..c498c8f9df2e 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -767,6 +767,7 @@ $(srcdir)/configure: $(srcdir)/configure.in
 $(srcdir)/config.in: $(srcdir)/cstamp-h.in
 $(srcdir)/cstamp-h.in: $(srcdir)/configure.in $(srcdir)/acconfig.h
 	cd $(srcdir) && autoheader
+	@rm -f $(srcdir)/cstamp-h.in
 	echo timestamp > $(srcdir)/cstamp-h.in
 auto-host.h: cstamp-h ; @true
 cstamp-h: config.in config.status
@@ -1959,8 +1960,11 @@ stmp-headers:
 	touch $@
 
 fixinc.sh :
-	cd ../contrib/fixinc ; CC=$(CC) MAKE=$(MAKE) CFLAGS=$(CFLAGS) \
-		$(SHELL) mkfixinc.sh $(target) $(srcdir)
+	INSTALLDIR=`cd $(srcdir) ; pwd` \
+	CC=$(CC) MAKE=$(MAKE) CFLAGS="$(CFLAGS)" ; \
+	export INSTALLDIR CC MAKE CFLAGS ; \
+		( cd ../contrib/fixinc ; \
+		$(SHELL) mkfixinc.sh $(target) $$INSTALLDIR )
 
 # Build fixed copies of system files.
 stmp-fixinc: $(FIXINCLUDES) gsyslimits.h