diff --git a/ChangeLog b/ChangeLog
index 40c8f1550e688070df1820ccced8e0dcf52a24c0..c7de7d7c14d2ebd9534ceaba95c51696ee272d25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 	<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00671.html>.
 	* configure.ac (gl_THREADLIB): Define to empty, since Emacs
 	does threads its own way.
+	* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
 
 2012-09-23  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 45666a335de90534684c6053f767cfc45dae2075..525868b2c70363ecff54fc3207a31319820a4119 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Check more robustly for timer_settime.
+	* sed1v2.inp, sed3v2.inp (LIB_TIMER_TIME): New macro.
+
 2012-08-04  Eli Zaretskii  <eliz@gnu.org>
 
 	* sedlibmk.inp (allocator.$(OBJEXT), careadlinkat.$(OBJEXT)): Fix
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 0ed8893169159bbc6c27f2f76ec8076df2b53410..fbee1dd03f9bc2f7e2a34e6d3d7f6742e19be34b 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -106,6 +106,7 @@ s/\.h\.in/.h-in/
 /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@//
 /^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@//
 /^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g
+/^LIB_TIMER_TIME *=/s/@[^@\n]*@//g
 /^LIBGNUTLS_LIBS *=/s/@[^@\n]*@//
 /^LIBGNUTLS_CFLAGS *=/s/@[^@\n]*@//
 /^GETLOADAVG_LIBS *=/s/@[^@\n]*@//
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index bfa008b3e81dc373945cdb831f5aefcc5065a3ad..cd58e47305c27038b3c086f4e3a4d5786e1be71f 100644
--- a/msdos/sed3v2.inp
+++ b/msdos/sed3v2.inp
@@ -36,6 +36,7 @@ s/-DVERSION[^ ]* //
 /^LIBS_MAIL *=/s/@[^@\n]*@//g
 /^LIBS_SYSTEM *=/s/@[^@\n]*@//g
 /^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g
+/^LIB_TIMER_TIME *=/s/@[^@\n]*@//g
 /^CFLAGS *=/s!=.*$!=-O2 -g!
 /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS -I../msdos!
 /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
diff --git a/src/ChangeLog b/src/ChangeLog
index c920f09106344e2d0bda108a648c89366b8a68f2..b0899d67ca8c5b1b5ec00c56e29f7bb3fe2bf2a6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,8 @@
 2012-09-27  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Check more robustly for timer_settime.
+	* Makefile.in (LIB_TIMER_TIME): New macro.
+	(LIBES): Add it.
 	* atimer.c (alarm_timer, alarm_timer_ok, set_alarm, init_atimer):
 	Use HAVE_TIMER_SETTIME, not SIGEV_SIGNAL, to decide whether to
 	call timer_settime.
diff --git a/src/Makefile.in b/src/Makefile.in
index e43f83e117223be7859183ae1da45b20a92ac1d6..f8da009171168a16412f232e4858122767f75535 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -153,6 +153,7 @@ M17N_FLT_CFLAGS = @M17N_FLT_CFLAGS@
 M17N_FLT_LIBS = @M17N_FLT_LIBS@
 
 LIB_CLOCK_GETTIME=@LIB_CLOCK_GETTIME@
+LIB_TIMER_TIME=@LIB_TIMER_TIME@
 
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_LIBS = @DBUS_LIBS@
@@ -385,8 +386,8 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \
 ## duplicated symbols.  If the standard libraries were compiled
 ## with GCC, we might need LIB_GCC again after them.
 LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
-   $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) $(DBUS_LIBS) \
-   $(LIB_EXECINFO) \
+   $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) $(LIB_TIMER_TIME) \
+   $(DBUS_LIBS) $(LIB_EXECINFO) \
    $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
    $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
    $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \