diff --git a/ChangeLog b/ChangeLog
index 8c38707438..a25945b0d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 26 23:30:39 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/code_objects.rb (RDoc::Context::add_class_or_module): 
+	  Restore correct :nopdoc: behavior with nested classes and modules.
+
 Mon Oct 25 18:35:39 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* win32/win32.c (isUNCRoot): should check NUL after '.'.
diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb
index 55b1cfa656..bd713ab92b 100644
--- a/lib/rdoc/code_objects.rb
+++ b/lib/rdoc/code_objects.rb
@@ -233,7 +233,8 @@ module RDoc
       else
         cls = class_type.new(name, superclass)
         puts "Adding class/module #{name} to #@name" if $DEBUG
-        collection[name] = cls if @document_self  && !@done_documenting
+#        collection[name] = cls if @document_self  && !@done_documenting
+        collection[name] = cls if !@done_documenting
         cls.parent = self
       end
       cls