diff --git a/lib/rsolr/client.rb b/lib/rsolr/client.rb
index 0f610e3d..8b550074 100644
--- a/lib/rsolr/client.rb
+++ b/lib/rsolr/client.rb
@@ -196,7 +196,7 @@ def build_request path, opts
       opts[:headers]['Content-Type'] ||= 'application/x-www-form-urlencoded; charset=UTF-8'
     end
     opts[:path] = path
-    opts[:uri] = base_uri.merge(path.to_s + (query ? "?#{query}" : "")) if base_uri
+    opts[:uri] = base_uri.merge((base_uri.path.nil? ? '' : base_uri.path) +  path.to_s + (query ? "?#{query}" : "")) if base_uri
     opts
   end