--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* modules/ullong_max: New file.
+
+	* modules/chdir-long, modules/openat: New files.
+	* modules/save-cwd (Depends-on): Depend on chdir-long.
+	(Makefile.am): Remove lib_SOURCES; now handled by AC_LIBSOURCES.
+
 2005-01-11  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
 
 	* modules/argp: Depend on vsnprintf

--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,39 @@
+2005-01-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Merge changes from coreutils, as described below in several
+	changelogs dated today.
+
+	* save-cwd.c: Include "save-cwd.h" before other include files.
+	(O_DIRECTORY): Remove; not needed here, since "." must be
+	a directory.  All uses removed.
+	(save_cwd): Use __sgi || __sun, not sun || __sun.  __sun is
+	universal on Suns, and we also need to test for IRIX.
+	Revamp code to use 'if' rather than '#if'.
+	Avoid unnecessary comparison of cwd->desc to 0.
+
+	* utimens.c (futimens): Robustify the previous patch, by checking
+	for known valid error numbers rather than observed invalid ones.
+
+2005-01-18  Jim Meyering  <jim@meyering.net>
+
+	* version-etc.c (version_etc_copyright): Update copyright date.
+
+	* utimens.c (futimens): Account for the fact that futimes
+	can also fail with errno == ENOSYS or errno == ENOENT.
+	Patch from Dmitry V. Levin.
+
+	Change the name of the robust chdir function from chdir to chdir_long.
+	* save-cwd.c: Include chdir-long.h rather than chdir.h.
+	(restore_cwd): Use chdir_long, not chdir.
+	* chdir-long.c: Renamed from chdir.c.
+	* chdir-long.h: Renamed from chdir.h.
+	[!defined PATH_MAX]: Define chdir_long to chdir on systems like the Hurd.
+2005-01-18  Bob Proulx  <bob@proulx.com>
+
+	* obstack.c [DEFAULT_ALIGNMENT]: Use an intermediate type to simplify
+	offsetof() macro construct to avoid compile failure with native HP-UX
+	11.0 ANSI C compiler.
+
 2005-01-06  Bruno Haible  <bruno@clisp.org>
 
 	* stpncpy.c: Remove HAVE_STPNCPY and gnu_stpncpy renaming, redundant

--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,30 @@
+2005-01-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Merge from coreutils.
+	* ullong_max.m4: New file.
+	* jm-macros.m4 (gl_MACROS): Require gl_ULLONG_MAX.
+	(gl_MACROS): Assume localeconv exists.
+
+2005-01-18  Jim Meyering  <jim@meyering.net>
+
+	Merge from coreutils.
+	* chdir-long.m4, openat.m4: New files.
+	* save-cwd.m4 (gl_SAVE_CWD): Add AC_LIBSOURCES for save-cwd.c,
+	save-cwd.h.  Add AC_LIBOBJ for save-cwd.
+	* chown.m4 (gl_FUNC_CHOWN): When cross-compiling, assume that chown
+	is sane and DOES follow symlinks.  Besides, testing 20 different
+	systems found no broken chown implementations.
+	Prompted by a change in rsync's copy of this macro.
+	* jm-macros.m4 (gl_MACROS): Require gl_FUNC_CHDIR_LONG.
+
+	* lchown.m4 (gl_FUNC_LCHOWN): Use AC_LIBSOURCES.
+
+	* utimes.m4: Work around tests/touch/empty-file failure on a system
+	(sparc64, Linux-2.4.28, glibc-2.3.3) that didn't honor utimes'
+	NULL-means-set-to-current-time semantics.
+	Remove temporary file immediately, rather than waiting
+	for configure's at-exit trap code to do it.
+
 2005-01-18  Bruno Haible  <bruno@clisp.org>
 
 	* allocsa.m4, codeset.m4, copy-file.m4, eaccess.m4, eealloc.m4: