diff --git a/ChangeLog b/ChangeLog
index 200c726994..ad865fdfd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	mktime: merge HAVE_CONFIG_H change from gnulib
+	* time/mktime.c: Include <config.h> if !_LIBC, not if HAVE_CONFIG_H.
+
 2012-05-22  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/unix/sysv/linux/x86_64/sysdep.h (SYSCALL_SET_ERRNO):
diff --git a/time/mktime.c b/time/mktime.c
index 683d468231..0e5fde015b 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -21,7 +21,7 @@
    mktime.  */
 /* #define DEBUG 1 */
 
-#ifdef HAVE_CONFIG_H
+#ifndef _LIBC
 # include <config.h>
 #endif