diff --git a/ChangeLog b/ChangeLog
index a210b8445f..6627531434 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 13 04:29:52 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_driver.rb (RiDriver::report_method_stuff): 
+	  Show fully-qualified class names in class list.
+
 Tue Jan 13 01:24:17 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* file.c (test_wr): Rdoc fix.  [ruby-core:02225]
diff --git a/lib/rdoc/ri/ri_driver.rb b/lib/rdoc/ri/ri_driver.rb
index 039a152c84..f6058cd51c 100644
--- a/lib/rdoc/ri/ri_driver.rb
+++ b/lib/rdoc/ri/ri_driver.rb
@@ -108,7 +108,7 @@ class  RiDriver
 
   def process_args
     if @options.list_classes
-      classes = @ri_reader.class_names
+      classes = @ri_reader.full_class_names
       @display.list_known_classes(classes)
     else
       if ARGV.size.zero?
diff --git a/lib/rdoc/ri/ri_reader.rb b/lib/rdoc/ri/ri_reader.rb
index ddce38f101..02e6d49b79 100644
--- a/lib/rdoc/ri/ri_reader.rb
+++ b/lib/rdoc/ri/ri_reader.rb
@@ -53,7 +53,7 @@ module RI
     end
 
     # return the names of all classes and modules
-    def class_names
+    def full_class_names
       res = []
       find_classes_in(res, @cache.toplevel)
     end
@@ -61,7 +61,7 @@ module RI
     def find_classes_in(res, klass)
       classes = klass.classes_and_modules
       for c in classes
-        res << c.name
+        res << c.full_name
         find_classes_in(res, c)
       end
       res