diff --git a/ChangeLog b/ChangeLog
index d6d75963de2..7a0e4874d8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Merge from gnulib, incorporating:
+	2012-08-02 stat-time, timespec, u64: support naive out-of-dir builds
+
 2012-08-02  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* lib/Makefile.am (DEFAULT_INCLUDES): Add -I$(top_srcdir)/lib for
diff --git a/lib/stat-time.c b/lib/stat-time.c
index 1a907ef250b..81b83ddb4fe 100644
--- a/lib/stat-time.c
+++ b/lib/stat-time.c
@@ -1,3 +1,3 @@
 #include <config.h>
 #define _GL_STAT_TIME_INLINE _GL_EXTERN_INLINE
-#include <stat-time.h>
+#include "stat-time.h"
diff --git a/lib/timespec.c b/lib/timespec.c
index 16a77647228..2b6098ed7bd 100644
--- a/lib/timespec.c
+++ b/lib/timespec.c
@@ -1,3 +1,3 @@
 #include <config.h>
 #define _GL_TIMESPEC_INLINE _GL_EXTERN_INLINE
-#include <timespec.h>
+#include "timespec.h"
diff --git a/lib/u64.c b/lib/u64.c
index 30dcb45b61f..04cf7a29946 100644
--- a/lib/u64.c
+++ b/lib/u64.c
@@ -1,3 +1,3 @@
 #include <config.h>
 #define _GL_U64_INLINE _GL_EXTERN_INLINE
-#include <u64.h>
+#include "u64.h"