1 files changed, 6 insertions, 0 deletions
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)