--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-23  Karl Berry  <karl@gnu.org>
+
+	* doc/gnulib-tool.texi (CVS Issues): mention that when foo_.h
+	exists, foo.h should be cvs-ignored, not committed.
+
 2007-02-23  Eric Blake  <ebb9@byu.net>
 
 	* lib/getdate.h (includes):  Include <time.h>, not "timespec.h".

--- a/doc/gnulib-tool.texi
+++ b/doc/gnulib-tool.texi
@@ -343,9 +343,20 @@
 should be treated like generated source files, like for example a
 @file{parser.c} file is generated from @file{parser.y}.
 
+@itemize
+
+@item
 In projects which commit all source files, whether generated or not, into
 CVS, the @code{gnulib-tool} generated files should all be committed.
 
+Gnulib also contains files generated by @command{make} (and removed by
+@code{make clean}, using information determined by @command{configure}
+They should not be checked into CVS, but instead added to
+@file{.cvsignore}.  When you have a Gnulib source file of the form
+@file{lib/foo_.h}, the corresponding @file{lib/foo.h} is such a file.
+
+
+@item
 In projects which customarily omit from the CVS all files that generated
 from other source files, all these files and directories would not be
 added into CVS.  The only file that must be added to CVS is
@@ -362,3 +373,5 @@
 but it does not offer the possibility to change the way Gnulib is used.
 Also it does not report in the ChangeLogs the files that it had to add
 because they were missing.
+
+@end itemize