diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 811ee3e257830cb862f1dc89ad59c3e050600140..46ac68c7929d78433df2bd81f55875c062dd7710 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-11  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR bootstrap/21481
+	* crtstuff.c: Include auto-host.h again, for now.
+
 2005-05-11  Richard Sandiford  <rsandifo@redhat.com>
 
 	* config/mips/24k.md: Remove trailing whitespace.
diff --git a/gcc/crtstuff.c b/gcc/crtstuff.c
index adc857c3666d74c5b751478ca0679a19d1255cf8..97ac69ad022ac813c8e7ab097b05e3da647f7258 100644
--- a/gcc/crtstuff.c
+++ b/gcc/crtstuff.c
@@ -54,6 +54,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 /* Target machine header files require this define. */
 #define IN_LIBGCC2
 
+/* FIXME: Including auto-host is incorrect, but until we have
+   identified the set of defines that need to go into auto-target.h,
+   this will have to do.  */
+#include "auto-host.h"
 #include "tconfig.h"
 #include "tsystem.h"
 #include "coretypes.h"