diff --git a/ChangeLog b/ChangeLog
index 843792d3cd..7523d3f202 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Oct 19 22:43:12 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_attr): If
+	  we come across 'attr' in a context where it isn't
+	  followed by a symbol, just issue a warning.
+
 Tue Oct 19 20:32:50 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole.c(ole_invoke): retrieve the result value when 
diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index e862cc71e1..5a98258f7e 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -2459,7 +2459,7 @@ module RDoc
 	  context.add_attribute(att)
 	end
       else
-	error("Missing argument to 'attr'")
+	warn("'attr' ignored - looks like a variable")
       end    
 
     end