diff --git a/rubygems_proxy.rb b/rubygems_proxy.rb
index 5e77d1e..e55b28b 100644
--- a/rubygems_proxy.rb
+++ b/rubygems_proxy.rb
@@ -16,11 +16,11 @@ def initialize(env)
   end
 
   def run
-    logger.info "#{env["REQUEST_METHOD"]} #{env["PATH_INFO"]}"
+    logger.info "#{env["REQUEST_METHOD"]} #{env["REQUEST_URI"]}"
 
     return update_specs if env["REQUEST_METHOD"] == "DELETE"
 
-    case env["PATH_INFO"]
+    case env["REQUEST_URI"]
     when "/"
       [200, {"Content-Type" => "text/html"}, [erb(:index)]]
     else
@@ -36,7 +36,7 @@ def erb(view)
   end
 
   def server_url
-    env["rack.url_scheme"] + "://" + File.join(env["SERVER_NAME"], env["PATH_INFO"])
+    env["rack.url_scheme"] + "://" + File.join(env["SERVER_NAME"], env["REQUEST_URI"])
   end
 
   def rubygems_url(gemname)
@@ -116,19 +116,19 @@ def cached?
   end
 
   def specs?
-    env["PATH_INFO"] =~ /specs\..+\.gz$/
+    env["REQUEST_URI"] =~ /specs\..+\.gz$/
   end
 
   def filepath
     if specs?
-      File.join(root_dir, env["PATH_INFO"])
+      File.join(root_dir, env["REQUEST_URI"])
     else
-      File.join(cache_dir, env["PATH_INFO"])
+      File.join(cache_dir, env["REQUEST_URI"])
     end
   end
 
   def url
-    File.join("http://rubygems.org", env["PATH_INFO"])
+    File.join("http://rubygems.org", env["REQUEST_URI"])
   end
 
   def update_specs