diff --git a/ChangeLog b/ChangeLog
index 30bca05bdb..62b72033fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Apr 11 10:47:04 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/code_objects.rb (RDoc::TopLevel::add_class_or_module): Toplevel
+	  classes and modules are a special case too... (handle extending existing
+	  classes with or without :enddoc:)
+
 Sat Apr 10 23:51:13 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/code_objects.rb (RDoc::Context::add_to): Implementation of :enddoc:
diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb
index 700f93a2a1..a60affb7de 100644
--- a/lib/rdoc/code_objects.rb
+++ b/lib/rdoc/code_objects.rb
@@ -441,10 +441,10 @@ module RDoc
         cls = all[name]
         if !cls
           cls = class_type.new(name, superclass)
-          all[name] = cls
+          all[name] = cls  unless @done_documenting
         end
         puts "Adding class/module #{name} to #@name" if $DEBUG
-        collection[name] = cls
+        collection[name] = cls unless @done_documenting
         cls.parent = self
       end
       cls