diff --git a/Makefile.pre.in b/Makefile.pre.in
index bc1e1513919..a9528a63f79 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -894,6 +894,6 @@ funny:
 
 # Dependencies
 
-Python/thread.o: $(srcdir)/Python/thread_*.h
+Python/thread.o: @THREADHEADERS@
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/configure b/configure
index a20911b343c..85aca3e9628 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.281 
+# From configure.in Revision: 1.282 
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
@@ -7513,9 +7513,16 @@ done
 #fi
 
 
+
+for h in `(cd $srcdir;echo Python/thread_*.h)`
+do
+  THREADHEADERS="$THREADHEADERS \$(srcdir)/$h"
+done
+
+
 SRCDIRS="Parser Grammar Objects Python Modules"
 echo $ac_n "checking for build directories""... $ac_c" 1>&6
-echo "configure:7519: checking for build directories" >&5
+echo "configure:7526: checking for build directories" >&5
 for dir in $SRCDIRS; do
     if test ! -d $dir; then
         mkdir $dir
@@ -7706,6 +7713,7 @@ s%@HAVE_GETHOSTBYNAME@%$HAVE_GETHOSTBYNAME%g
 s%@LIBM@%$LIBM%g
 s%@LIBC@%$LIBC%g
 s%@UNICODE_OBJS@%$UNICODE_OBJS%g
+s%@THREADHEADERS@%$THREADHEADERS%g
 s%@SRCDIRS@%$SRCDIRS%g
 
 CEOF
diff --git a/configure.in b/configure.in
index 349042b49dd..adfb2fd39c7 100644
--- a/configure.in
+++ b/configure.in
@@ -2018,6 +2018,13 @@ done
 #    AC_MSG_RESULT(already exists)
 #fi
 
+AC_SUBST(THREADHEADERS)
+
+for h in `(cd $srcdir;echo Python/thread_*.h)`
+do
+  THREADHEADERS="$THREADHEADERS \$(srcdir)/$h"
+done
+
 AC_SUBST(SRCDIRS)
 SRCDIRS="Parser Grammar Objects Python Modules"
 AC_MSG_CHECKING(for build directories)