diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 0236c838e06..c5068efed47 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -6,7 +6,9 @@
  */
 
 #include "Python.h"
+#ifdef HAVE_VALUES_H
 #include <values.h>
+#endif
 #include "structmember.h"
 
 #ifdef WITH_THREAD
diff --git a/configure b/configure
index fbdee04d019..dc13446aa83 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 52387 .
+# From configure.in Revision: 52389 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.6.
 #
@@ -4695,6 +4695,7 @@ done
 
 
 
+
 
 
 for ac_header in asm/types.h conio.h curses.h direct.h dlfcn.h errno.h \
@@ -4707,7 +4708,7 @@ sys/modem.h \
 sys/param.h sys/poll.h sys/select.h sys/socket.h sys/statvfs.h sys/stat.h \
 sys/time.h \
 sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
-sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
+sys/resource.h netpacket/packet.h sysexits.h values.h bluetooth.h \
 bluetooth/bluetooth.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/configure.in b/configure.in
index 41c0eb5d913..e8b3377fbee 100644
--- a/configure.in
+++ b/configure.in
@@ -1092,7 +1092,7 @@ sys/modem.h \
 sys/param.h sys/poll.h sys/select.h sys/socket.h sys/statvfs.h sys/stat.h \
 sys/time.h \
 sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
-sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
+sys/resource.h netpacket/packet.h sysexits.h values.h bluetooth.h \
 bluetooth/bluetooth.h)
 AC_HEADER_DIRENT
 AC_HEADER_MAJOR
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 64078717258..8dd32c1279e 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -703,6 +703,9 @@
 /* Define to 1 if you have the <utime.h> header file. */
 #undef HAVE_UTIME_H
 
+/* Define to 1 if you have the <values.h> header file. */
+#undef HAVE_VALUES_H
+
 /* Define to 1 if you have the `wait3' function. */
 #undef HAVE_WAIT3