1 files changed, 8 insertions, 1 deletions
diff --git a/lib/rdoc/ri/ri_driver.rb b/lib/rdoc/ri/ri_driver.rb
index afefa67dc2..35c20a7a1a 100644
--- a/lib/rdoc/ri/ri_driver.rb
+++ b/lib/rdoc/ri/ri_driver.rb
@@ -12,7 +12,14 @@ class  RiDriver
 
   def initialize
     @options = RI::Options.instance
-    @options.parse
+
+    args = ARGV
+    if ENV["RI"]
+      args = ENV["RI"].split.concat(ARGV)
+    end
+
+    @options.parse(args)
+
     paths = @options.paths || RI::Paths::PATH
     if paths.empty?
       $stderr.puts "No ri documentation found in:"