Index: src/OFHTTPResponse.m
==================================================================
--- src/OFHTTPResponse.m
+++ src/OFHTTPResponse.m
@@ -111,13 +111,15 @@
 	    (contentType = [_headers objectForKey: @"Content-Type"]) != nil) {
 		contentType = [contentType lowercaseString];
 
 		if ([contentType hasSuffix: @"charset=utf-8"])
 			encoding = OF_STRING_ENCODING_UTF_8;
-		else if ([contentType hasSuffix: @"charset=iso-8859-1"])
+		else if ([contentType hasSuffix: @"charset=iso-8859-1"] ||
+		    [contentType hasSuffix: @"charset=iso_8859-1"])
 			encoding = OF_STRING_ENCODING_ISO_8859_1;
-		else if ([contentType hasSuffix: @"charset=iso-8859-15"])
+		else if ([contentType hasSuffix: @"charset=iso-8859-15"] ||
+		    [contentType hasSuffix: @"charset=iso_8859-15"])
 			encoding = OF_STRING_ENCODING_ISO_8859_15;
 		else if ([contentType hasSuffix: @"charset=windows-1251"] ||
 		    [contentType hasSuffix: @"charset=cp1251"] ||
 		    [contentType hasSuffix: @"charset=cp-1251"])
 			encoding = OF_STRING_ENCODING_WINDOWS_1251;

Index: src/OFLocalization.m
==================================================================
--- src/OFLocalization.m
+++ src/OFLocalization.m
@@ -101,14 +101,16 @@
 				_encoding = OF_STRING_ENCODING_UTF_8;
 			else if (strcmp(tmp, "ascii") == 0 ||
 			    strcmp(tmp, "us-ascii") == 0)
 				_encoding = OF_STRING_ENCODING_ASCII;
 			else if (strcmp(tmp, "iso8859-1") == 0 ||
-			    strcmp(tmp, "iso-8859-1") == 0)
+			    strcmp(tmp, "iso-8859-1") == 0 ||
+			    strcmp(tmp, "iso_8859-1") == 0)
 				_encoding = OF_STRING_ENCODING_ISO_8859_1;
 			else if (strcmp(tmp, "iso8859-15") == 0 ||
-			    strcmp(tmp, "iso-8859-15") == 0)
+			    strcmp(tmp, "iso-8859-15") == 0 ||
+			    strcmp(tmp, "iso_8859-15") == 0)
 				_encoding = OF_STRING_ENCODING_ISO_8859_15;
 			/* Windows and DJGPP use a codepage */
 			else if (strcmp(tmp, "1251") == 0)
 				_encoding = OF_STRING_ENCODING_WINDOWS_1251;
 			else if (strcmp(tmp, "1252") == 0)

Index: src/OFXMLParser.m
==================================================================
--- src/OFXMLParser.m
+++ src/OFXMLParser.m
@@ -464,14 +464,16 @@
 			if ([attribute isEqual: @"encoding"]) {
 				[value lowercase];
 
 				if ([value isEqual: @"utf-8"])
 					_encoding = OF_STRING_ENCODING_UTF_8;
-				else if ([value isEqual: @"iso-8859-1"])
+				else if ([value isEqual: @"iso-8859-1"] ||
+				    [value isEqual: @"iso_8859-1"])
 					_encoding =
 					    OF_STRING_ENCODING_ISO_8859_1;
-				else if ([value isEqual: @"iso-8859-15"])
+				else if ([value isEqual: @"iso-8859-15"] ||
+				    [value isEqual: @"iso_8859-15"])
 					_encoding =
 					    OF_STRING_ENCODING_ISO_8859_15;
 				else if ([value isEqual: @"windows-1251"] ||
 				    [value isEqual: @"cp1251"] ||
 				    [value isEqual: @"cp-1251"])