diff --git a/ChangeLog b/ChangeLog
index 609dd0263..d616a2148 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-09  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSXMLParser.m: treat unknown/undefined encodings as utf-8
+	so we tolerate bad xml documents better.
+
 2011-05-02  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* Source/Additions/GSObjCRuntime.m (GSSelectorFromNameAndTypes):
diff --git a/Source/NSXMLParser.m b/Source/NSXMLParser.m
index 768b8aead..3af50a555 100644
--- a/Source/NSXMLParser.m
+++ b/Source/NSXMLParser.m
@@ -752,7 +752,9 @@ static SEL	foundIgnorableSel;
 	   */
 	  enc = [GSMimeDocument encodingFromCharset:
 	    [GSMimeDocument charsetForXml: data]];
-	  if (enc == NSUTF8StringEncoding || enc == NSASCIIStringEncoding)
+	  if (enc == NSUTF8StringEncoding
+	    || enc == NSASCIIStringEncoding
+	    || enc == GSUndefinedEncoding)
 	    {
 	      this->data = [data copy];
 	    }