diff --git a/ChangeLog b/ChangeLog
index 22982e04eb1..359035e5800 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Merge from gnulib, incorporating:
+	2012-07-06 timespec-sub: avoid duplicate include
+	Reported by Juanma Barranquero.
+
 2012-07-06  Glenn Morris  <rgm@gnu.org>
 
 	* make-dist [update]: Let autoreconf figure out what needs updating.
diff --git a/lib/timespec-sub.c b/lib/timespec-sub.c
index 0b3bb1b57e1..7c4c781b7f6 100644
--- a/lib/timespec-sub.c
+++ b/lib/timespec-sub.c
@@ -21,7 +21,6 @@
    overflow, return an extremal value.  This assumes 0 <= tv_nsec <=
    999999999.  */
 
-#include <config.h>
 #include <config.h>
 #include "timespec.h"