diff --git a/ChangeLog b/ChangeLog
index 892fbea6a8..d4026bd98d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 22 22:33:02 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Don't use names
+	  of variables or constants when parsing 'require'
+
 Mon Nov 22 00:13:35 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (dir_seek): should retrieve dir_data after NUM2INT().
diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index 8f1206409a..1a61c4bf1e 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -2389,12 +2389,12 @@ module RDoc
     case tk
     when TkSTRING
       name = tk.text
-    when TkCONSTANT, TkIDENTIFIER, TkIVAR, TkGVAR
-      name = tk.name
+#    when TkCONSTANT, TkIDENTIFIER, TkIVAR, TkGVAR
+#      name = tk.name
     when TkDSTRING
       warn "Skipping require of dynamic string: #{tk.text}"
-    else
-      warn "'require' used as variable"
+ #   else
+ #     warn "'require' used as variable"
     end
     if name
       context.add_require(Require.new(name, comment))