@@ -584,13 +584,15 @@
 		if OF_UNLIKELY (first)
 			first = false;
 		else
 			[ret appendString: @"&"];
 
-		[ret appendString: [[key description] stringByURLEncoding]];
+		[ret appendString: [[key description]
+		    stringByURLEncodingWithAllowedCharacters: "-._~!$'()*+,;"]];
 		[ret appendString: @"="];
-		[ret appendString: [[object description] stringByURLEncoding]];
+		[ret appendString: [[object description]
+		    stringByURLEncodingWithAllowedCharacters: "-._~!$'()*+,;"]];
 	}
 
 	[ret makeImmutable];
 
 	objc_autoreleasePoolPop(pool);