diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4794c4253c8..fcfa5dbbb0e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,7 @@
 2000-06-09  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
+	* configure.in: Also avoid wrapping auto-build.h with IN_GCC.
+
 	* scan-types.sh (VALUE) Wrap use with double quotes to protect
 	variable against filename expansion when it contains "char *".
 
diff --git a/gcc/configure b/gcc/configure
index 5dda2dbfd35..b622d267444 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -6854,7 +6854,7 @@ do
 
 	for file in `eval echo '$'$var`; do
 		case $file in
-		auto-host.h)
+		auto-host.h | auto-build.h )
 			;;
 		*)
 			echo '#ifdef IN_GCC' >>$link
@@ -6862,7 +6862,7 @@ do
 		esac
 		echo "#include \"$file\"" >>$link
 		case $file in
-		auto-host.h)
+		auto-host.h | auto-build.h )
 			;;
 		*)
 			echo '#endif' >>$link
diff --git a/gcc/configure.in b/gcc/configure.in
index 90540547db1..8b29691ef1b 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -4056,7 +4056,7 @@ do
 
 	for file in `eval echo '$'$var`; do
 		case $file in
-		auto-host.h)
+		auto-host.h | auto-build.h )
 			;;
 		*)
 			echo '#ifdef IN_GCC' >>$link
@@ -4064,7 +4064,7 @@ do
 		esac
 		echo "#include \"$file\"" >>$link
 		case $file in
-		auto-host.h)
+		auto-host.h | auto-build.h )
 			;;
 		*)
 			echo '#endif' >>$link