diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index e3658b019..17b414e63 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-12  Igor Peshansky  <pechtcha@cs.nyu.edu>
+
+	* doctool.c (scan_directory): Ignore "CVS" directories.
+
 2005-12-30  Christopher Faylor  <cgf@timesys.com>
 
 	* relnotes.texinfo: Remove entry about hyperthreaded processor.
diff --git a/winsup/doc/doctool.c b/winsup/doc/doctool.c
index ae034f345..0a5060c76 100644
--- a/winsup/doc/doctool.c
+++ b/winsup/doc/doctool.c
@@ -1,6 +1,6 @@
 /* doctool.c
 
-   Copyright 1998,1999,2000,2001 Red Hat, Inc.
+   Copyright 1998,1999,2000,2001,2006 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -157,7 +157,7 @@ scan_directory(dirname)
 
     STAT(name, &st);
 
-    if (S_ISDIR(st.st_mode))
+    if (S_ISDIR(st.st_mode) && strcmp(de->d_name, "CVS") != 0)
     {
       scan_directory(name);
     }