diff --git a/ChangeLog b/ChangeLog
index ef535ae067..098fe17a02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 13 01:04:37 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_paths.rb (RI::Paths): First attempt at
+	  incorporating DESTDIR in the rdoc installation.
+
 Mon Jan 12 23:26:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (primary): fix position after FCALL.  [ruby-dev:22574]
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
index ddcf217c4b..215826c4f3 100644
--- a/lib/rdoc/rdoc.rb
+++ b/lib/rdoc/rdoc.rb
@@ -159,6 +159,7 @@ module RDoc
         when "file"
           file_list << rel_file_name
         when "directory"
+          next if rel_file_name == "CVS" || rel_file_name == ".svn"
           next if options.exclude && options.exclude =~ rel_file_name
           dot_doc = File.join(rel_file_name, DOT_DOC_FILENAME)
           if File.file?(dot_doc)