diff --git a/packages/cdn/s3.cfc b/packages/cdn/s3.cfc
index e90ca9496..57030758f 100644
--- a/packages/cdn/s3.cfc
+++ b/packages/cdn/s3.cfc
@@ -225,8 +225,9 @@
 		<cfset fullpath = arguments.config.pathPrefix & fullpath />
 		
 		<!--- URL encode the filename --->
-		<cfset fullpath = replacelist(urlencodedformat(fullpath),"%2F,%20,%2D,%2E,%5F,%27,%28,%29,%26","/, ,-,.,_,',(,),&")>
-		
+		<cfset fullpath = replacelist(urlencodedformat(fullpath),"%2F,%20,%2D,%2E,%5F,%27,%28,%29,%26,%5B,%5D","/, ,-,.,_,',(,),&,[,]")>
+		<cfset fullpath = replaceNoCase(fullpath, "%2C", ",")>
+
 		<cfset fullpath = "s3://#arguments.config.accessKeyId#:#arguments.config.awsSecretKey#@#arguments.config.bucket##fullpath#" />
 		
 		<cfreturn fullpath />