@@ -604,11 +604,11 @@
 	}
 }
 
 -	  (bool)client: (OFHTTPClient *)client
   shouldFollowRedirect: (OFURL *)URL
-	    statusCode: (int)statusCode
+	    statusCode: (short)statusCode
 	       request: (OFHTTPRequest *)request
 	      response: (OFHTTPResponse *)response
 {
 	if (_verbose) {
 		void *pool = objc_autoreleasePoolPush();
@@ -705,11 +705,11 @@
 		    @"url", request.URL.string,
 		    @"error", error,
 		    @"exception", e)];
 	} else if ([e isKindOfClass: [OFHTTPRequestFailedException class]]) {
 		short statusCode = [[e response] statusCode];
-		OFString *codeString = [OFString stringWithFormat: @"%d %@",
+		OFString *codeString = [OFString stringWithFormat: @"%hd %@",
 		    statusCode, of_http_status_code_to_string(statusCode)];
 		[of_stderr writeLine: OF_LOCALIZED(@"download_failed",
 		    @"%[prog]: Failed to download <%[url]>!\n"
 		    @"  HTTP status code: %[code]",
 		    @"prog", [OFApplication programName],
@@ -784,11 +784,11 @@
 	return true;
 }
 
 -      (void)client: (OFHTTPClient *)client
   didReceiveHeaders: (OFDictionary OF_GENERIC(OFString *, OFString *) *)headers
-	 statusCode: (int)statusCode
+	 statusCode: (short)statusCode
 	    request: (OFHTTPRequest *)request
 {
 	if (statusCode != 206)
 		_resumedFrom = 0;
 
@@ -795,11 +795,11 @@
 	if (!_quiet) {
 		OFString *lengthString =
 		    [headers objectForKey: @"Content-Length"];
 		OFString *type = [headers objectForKey: @"Content-Type"];
 
-		[of_stdout writeFormat: @" ➜ %d\n", statusCode];
+		[of_stdout writeFormat: @" ➜ %hd\n", statusCode];
 
 		if (type == nil)
 			type = OF_LOCALIZED(@"type_unknown", @"unknown");
 
 		if (lengthString != nil) {