@@ -451,11 +451,11 @@
 	return true;
 }
 
 - (bool)parseHeaders: (OFString*)line
 {
-	OFString *key, *value;
+	OFString *key, *value, *old;
 	size_t pos;
 
 	if ([line length] == 0) {
 		intmax_t contentLength;
 
@@ -497,10 +497,14 @@
 	    of_range(pos + 1, [line length] - pos - 1)];
 
 	key = normalizedKey([key stringByDeletingTrailingWhitespaces]);
 	value = [value stringByDeletingLeadingWhitespaces];
 
+	old = [_headers objectForKey: key];
+	if (old != nil)
+		value = [old stringByAppendingFormat: @",%@", value];
+
 	[_headers setObject: value
 		     forKey: key];
 
 	if ([key isEqual: @"Host"]) {
 		pos = [value