diff --git a/lib/aws/s3/connection.rb b/lib/aws/s3/connection.rb
index 1b91127..2073e4c 100644
--- a/lib/aws/s3/connection.rb
+++ b/lib/aws/s3/connection.rb
@@ -8,7 +8,7 @@ def connect(options = {})
         
         def prepare_path(path)
           path = path.remove_extended unless path.valid_utf8?
-          URI.escape(path)
+          URI.escape(path).gsub('+', '%2B').gsub('[', '%5B').gsub(']', '%5D')
         end
       end
       
@@ -275,4 +275,4 @@ def validate(options)
       end
     end
   end
-end
\ No newline at end of file
+end