diff --git a/ChangeLog b/ChangeLog
index 5d195c1af6..05fcbaf6b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon May 10 21:44:42 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb: Change scheme for
+	  looking up symbols in  HTML generator.
+
 Mon May 10 16:45:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (eval): warning during eval should not cause deadlock.
diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb
index ba1a512b16..ef08951063 100644
--- a/lib/rdoc/generators/html_generator.rb
+++ b/lib/rdoc/generators/html_generator.rb
@@ -380,10 +380,18 @@ module Generators
       res = []
       array.each do |i|
         ref = AllReferences[i.name] 
-        if !ref && @context.parent
-          name = @context.parent.name + "::" + i.name
-          ref = AllReferences[name] 
-        end
+#         if !ref
+#           container = @context.parent
+#           while !ref && container
+#             name = container.name + "::" + i.name
+#             ref = AllReferences[name] 
+#             container = container.parent
+#           end
+#         end
+
+        ref = @context.find_symbol(i.name)
+        ref = ref.viewer if ref
+
         if !ref && block_given?
           possibles = yield(i.name)
           while !ref and !possibles.empty?