diff --git a/lib/fog/storage/aws.rb b/lib/fog/storage/aws.rb
index abec06608..8b6428189 100644
--- a/lib/fog/storage/aws.rb
+++ b/lib/fog/storage/aws.rb
@@ -343,7 +343,7 @@ DATA
           unless subdomain.nil? || subdomain == @host
             canonical_resource << "#{CGI.escape(subdomain).downcase}/"
           end
-          canonical_resource << params[:path].to_s
+          canonical_resource << CGI.escape(params[:path].to_s).gsub('%2F', '/')
           canonical_resource << '?'
           for key in (params[:query] || {}).keys
             if %w{acl location logging notification partNumber policy requestPayment torrent uploadId uploads versionId versioning versions}.include?(key)