diff --git a/ChangeLog b/ChangeLog
index 5ff4069403..57f1138a29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Mar  9 09:52:00 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/code_objects.rb: Remove debugging Kernel#p.  Patch by
+	Lincoln Stoll <lstoll at lstoll.net>
+	* lib/rdoc/generator/html.rb: Fully qualify AllReferences.  Patch by
+	Lincoln Stoll <lstoll at lstoll.net>
+	* lib/rdoc/ri/writer.rb: Fix 1.8 backwards compatibility.
+
 Sat Mar  8 18:50:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (isdirsep): backslash is valid path separator on cygwin too.
diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb
index da383d69c4..b93ec99007 100644
--- a/lib/rdoc/code_objects.rb
+++ b/lib/rdoc/code_objects.rb
@@ -410,8 +410,8 @@ module RDoc
       end
       if result && method
         if !result.respond_to?(:find_local_symbol)
-          p result.name
-          p method
+          #p result.name
+          #p method
           fail
         end
         result = result.find_local_symbol(method)
diff --git a/lib/rdoc/generator/html.rb b/lib/rdoc/generator/html.rb
index 95617725e9..f035857aff 100644
--- a/lib/rdoc/generator/html.rb
+++ b/lib/rdoc/generator/html.rb
@@ -247,7 +247,7 @@ class RDoc::Generator::HTML
     @main_page = @options.main_page
     @main_page_ref = nil
     if @main_page
-      @main_page_ref = AllReferences[@main_page]
+      @main_page_ref = RDoc::Generator::AllReferences[@main_page]
       if @main_page_ref then
         @main_page_path = @main_page_ref.path
       else
diff --git a/lib/rdoc/ri/writer.rb b/lib/rdoc/ri/writer.rb
index 2d14942bdd..92aaa1c2da 100644
--- a/lib/rdoc/ri/writer.rb
+++ b/lib/rdoc/ri/writer.rb
@@ -12,7 +12,11 @@ class RDoc::RI::Writer
   # form (where punctuation is replaced by %xx)
 
   def self.internal_to_external(name)
-    name.gsub(/\W/) { "%%%02x" % $&[0].ord }
+    if ''.respond_to? :ord then
+      name.gsub(/\W/) { "%%%02x" % $&[0].ord }
+    else
+      name.gsub(/\W/) { "%%%02x" % $&[0] }
+    end
   end
 
   ##