diff --git a/ChangeLog b/ChangeLog
index 84bb1e8c4f..b25006d2c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 25 03:57:47 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_util.rb (NameDescriptor::initialize): No longer
+	  allow nested classes to be designated using "."--you must
+	  now use "::"
+
 Thu Mar 25 02:00:18 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/generators/template/html/one_page_html.rb (Page): 
diff --git a/lib/rdoc/ri/ri_util.rb b/lib/rdoc/ri/ri_util.rb
index d8678c49d7..8a01255897 100644
--- a/lib/rdoc/ri/ri_util.rb
+++ b/lib/rdoc/ri/ri_util.rb
@@ -43,6 +43,7 @@ class NameDescriptor
       @class_names << tokens.shift
       unless tokens.empty?
         separator = tokens.shift
+        break unless separator == "::"
       end
     end