diff --git a/.cvsignore b/.cvsignore
index dc06f0b2f..45cfe2a0e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,8 +8,6 @@ Makefile
 Makefile.in
 THANKS-to-translators
 aclocal.m4
-config.h
-config.hin
 config.status
 configure
 stamp-h1
diff --git a/ChangeLog b/ChangeLog
index c716782e6..2010825bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-08-23  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* .cvsignore: Remove config.h, config.hin, as they are now
+	in lib.
+	* configure.ac (AC_CONFIG_HEADERS): Move config.h and config.hin
+	to lib.
+	* src/Makefile.am (AM_CPPFLAGS): Remove '-I..'; no longer needed.
+
 	* bootstrap (slurp): Define gl_LOCK_EARLY instead of gl_LOCK,
 	to accommodate today's gnulib change.
 
diff --git a/configure.ac b/configure.ac
index 70633a225..c20d0b591 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_INIT([GNU coreutils],[6.2-cvs],[bug-coreutils@gnu.org])
 AC_CONFIG_SRCDIR(src/ls.c)
 
 AC_CONFIG_AUX_DIR(build-aux)
-AC_CONFIG_HEADERS([config.h:config.hin])
+AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])
 
 AB_INIT()
 AM_INIT_AUTOMAKE([1.9.6 gnits dist-bzip2])
diff --git a/lib/.cvsignore b/lib/.cvsignore
index 3e1851e0c..d943f8606 100644
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -41,6 +41,8 @@ close-stream.h
 closeout.c
 closeout.h
 config.charset
+config.h
+config.hin
 creat-safer.c
 cycle-check.c
 cycle-check.h
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 02e235bfe..03d1599cd 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* .cvsignore: Add config.h, config.hin.
+	* Makefile.am (AM_CPPFLAGS): Remove; we no longer need '-I..'.
+
 2006-08-22  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* .cvsignore: Add Makefile.in, getdate.tab.h.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 85750f620..61d8e1fc2 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,7 +19,6 @@
 
 include gnulib.mk
 
-AM_CPPFLAGS += -I..
 AM_CFLAGS = $(WARNING_CFLAGS) $(WERROR_CFLAGS)
 
 noinst_PROGRAMS = t-fpending
diff --git a/src/Makefile.am b/src/Makefile.am
index c65d2be2a..8442b8e63 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,7 +50,7 @@ EXTRA_DIST = dcgen dircolors.hin tac-pipe.c \
   groups.sh wheel-gen.pl extract-magic c99-to-c89.diff
 CLEANFILES = $(SCRIPTS) su
 
-AM_CPPFLAGS = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../lib
+AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir)/lib -I../lib
 
 # Sometimes, the expansion of $(LIBINTL) includes -lc which may
 # include modules defining variables like `optind', so libcoreutils.a