diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ed3c96af190..1aab743ff68 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-10  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* configure.ac (tm_include_list): Add insn-constants.h.
+	* configure: Regenerate.
+	* Makefile.in (GTM_H): Move insn-constants.h here from...
+	(TM_H): ...here.
+	* mkconfig.sh: Remove special handling for insn-constants.h.
+
 2010-06-10  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* Makefile.in (BUILD_RTL): Move build/read-md.o to...
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index bdafaa55ca2..1a543bf18bd 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -816,8 +816,8 @@ BCONFIG_H = bconfig.h $(build_xm_file_list)
 CONFIG_H  = config.h  $(host_xm_file_list)
 TCONFIG_H = tconfig.h $(xm_file_list)
 TM_P_H    = tm_p.h    $(tm_p_file_list)
-GTM_H     = tm.h      $(tm_file_list)
-TM_H      = $(GTM_H) insn-constants.h insn-flags.h options.h
+GTM_H     = tm.h      $(tm_file_list) insn-constants.h
+TM_H      = $(GTM_H) insn-flags.h options.h
 
 # Variables for version information.
 BASEVER     := $(srcdir)/BASE-VER  # 4.x.y
diff --git a/gcc/configure b/gcc/configure
index 33aa2cf5601..50baf170e19 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -10823,7 +10823,7 @@ tmake_file="${tmake_file_}"
 out_object_file=`basename $out_file .c`.o
 
 tm_file_list="options.h"
-tm_include_list="options.h"
+tm_include_list="options.h insn-constants.h"
 for f in $tm_file; do
   case $f in
     ./* )
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 7b1b72eed3b..d8276985b0d 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1643,7 +1643,7 @@ tmake_file="${tmake_file_}"
 out_object_file=`basename $out_file .c`.o
 
 tm_file_list="options.h"
-tm_include_list="options.h"
+tm_include_list="options.h insn-constants.h"
 for f in $tm_file; do
   case $f in
     ./* )
diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
index c9d35cce2a6..cfa5a56467e 100644
--- a/gcc/mkconfig.sh
+++ b/gcc/mkconfig.sh
@@ -87,15 +87,14 @@ if [ -n "$HEADERS" ]; then
     fi
 fi
 
-# If this is tm.h, now include insn-constants.h and insn-flags.h only
-# if IN_GCC is defined but neither GENERATOR_FILE nor USED_FOR_TARGET
-# is defined.  (Much of this is temporary.)
+# If this is tm.h, now include insn-flags.h only if IN_GCC is defined
+# but neither GENERATOR_FILE nor USED_FOR_TARGET is defined.  (Much of
+# this is temporary.)
 
 case $output in
     tm.h )
         cat >> ${output}T <<EOF
 #if defined IN_GCC && !defined GENERATOR_FILE && !defined USED_FOR_TARGET
-# include "insn-constants.h"
 # include "insn-flags.h"
 #endif
 EOF