Index: src/OFHTTPClient.m
==================================================================
--- src/OFHTTPClient.m
+++ src/OFHTTPClient.m
@@ -81,27 +81,29 @@
 constructRequestString(OFHTTPRequest *request)
 {
 	void *pool = objc_autoreleasePoolPush();
 	of_http_request_method_t method = [request method];
 	OFURL *URL = [request URL];
-	OFString *path = [URL path];
+	OFString *path;
 	OFString *user = [URL user], *password = [URL password];
 	OFData *body = [request body];
 	OFMutableString *requestString;
 	OFMutableDictionary OF_GENERIC(OFString *, OFString *) *headers;
 	OFEnumerator OF_GENERIC(OFString *) *keyEnumerator, *objectEnumerator;
 	OFString *key, *object;
 
-	if (path == nil)
+	if ([URL path] != nil)
+		path = [URL URLEncodedPath];
+	else
 		path = @"/";
 
 	requestString = [OFMutableString stringWithFormat:
 	    @"%s %@", of_http_request_method_to_string(method), path];
 
 	if ([URL query] != nil) {
 		[requestString appendString: @"?"];
-		[requestString appendString: [URL query]];
+		[requestString appendString: [URL URLEncodedQuery]];
 	}
 
 	[requestString appendString: @" HTTP/"];
 	[requestString appendString: [request protocolVersionString]];
 	[requestString appendString: @"\r\n"];
@@ -113,16 +115,16 @@
 	if ([headers objectForKey: @"Host"] == nil) {
 		OFNumber *port = [URL port];
 
 		if (port != nil) {
 			OFString *host = [OFString stringWithFormat:
-			    @"%@:%@", [URL host], port];
+			    @"%@:%@", [URL URLEncodedHost], port];
 
 			[headers setObject: host
 				    forKey: @"Host"];
 		} else
-			[headers setObject: [URL host]
+			[headers setObject: [URL URLEncodedHost]
 				    forKey: @"Host"];
 	}
 
 	if (([user length] > 0 || [password length] > 0) &&
 	    [headers objectForKey: @"Authorization"] == nil) {