diff --git a/ChangeLog b/ChangeLog
index b07713fbd0..91219c2eb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Jan 11 02:07:47 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList): 
+	  Also accept command line options via the 'RI' environment variable.
+
+Sun Jan 11 02:07:47 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList): 
+	  Also accept command line options via the 'RI' environment variable.
+
 Fri Jan  9 10:05:14 2004  Siena.  <siena@faculty.chiba-u.jp>
 
 	* lib/mkmf.rb (libpathflag): use single quotes.  [ruby-dev:22440]
diff --git a/lib/rdoc/ri/ri_options.rb b/lib/rdoc/ri/ri_options.rb
index c62335c147..0e720a9c64 100644
--- a/lib/rdoc/ri/ri_options.rb
+++ b/lib/rdoc/ri/ri_options.rb
@@ -150,6 +150,7 @@ module RI
             end
             puts
           end
+          puts "Options may also be passed in the 'RI' environment varaible"
           exit 0
         end
       end
@@ -164,6 +165,11 @@ module RI
       @formatter    = RI::TextFormatter.for("plain") 
         @list_classes = false
 
+      old_argv = ARGV.dup
+      if ENV["RI"]
+        ARGV.replace(ENV["RI"].split.concat(ARGV))
+      end
+
       begin
 
         go = GetoptLong.new(*OptionList.options)