1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb
index c48f5957b2..700f93a2a1 100644
--- a/lib/rdoc/code_objects.rb
+++ b/lib/rdoc/code_objects.rb
@@ -233,14 +233,14 @@ module RDoc
       else
         cls = class_type.new(name, superclass)
         puts "Adding class/module #{name} to #@name" if $DEBUG
-        collection[name] = cls
+        collection[name] = cls if @document_self  && !@done_documenting
         cls.parent = self
       end
       cls
     end
 
     def add_to(array, thing)
-      array <<  thing if @document_self
+      array <<  thing if @document_self  && !@done_documenting
       thing.parent = self
     end