@@ -503,11 +503,11 @@
 	status = (int)[[line substringWithRange: of_range(9, 3)] decimalValue];
 
 	serverHeaders = [OFMutableDictionary dictionary];
 
 	for (;;) {
-		OFString *key, *value;
+		OFString *key, *value, *old;
 		const char *lineC, *tmp;
 		char *keyC;
 
 		@try {
 			line = [socket readLine];
@@ -546,10 +546,14 @@
 			tmp++;
 		} while (*tmp == ' ');
 
 		value = [OFString stringWithUTF8String: tmp];
 
+		old = [serverHeaders objectForKey: key];
+		if (old != nil)
+			value = [old stringByAppendingFormat: @",%@", value];
+
 		[serverHeaders setObject: value
 				  forKey: key];
 	}
 
 	[serverHeaders makeImmutable];