diff --git a/ChangeLog b/ChangeLog
index 90999c0ed..7ea59ce04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-22  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/NSAttributedString.m
+	(-initWithData:options:documentAttributes:error:): Set
+	NSCharacterEncodingDocumentAttribute in the documentAttributes dict
+	when reading plain text.
+
 2012-03-22  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* TextConverters/RTF/RTFConsumer.m: Set NSDocumentTypeDocumentAttribute
diff --git a/Source/NSAttributedString.m b/Source/NSAttributedString.m
index 54f16fbe9..927a6ca77 100644
--- a/Source/NSAttributedString.m
+++ b/Source/NSAttributedString.m
@@ -845,7 +845,8 @@ create_error(int code, NSString* desc)
       if (dict != NULL)
 	{
 	  *dict = [NSDictionary dictionaryWithObjectsAndKeys:
-				  NSPlainTextDocumentType,  NSDocumentTypeDocumentAttribute,
+				  NSPlainTextDocumentType, NSDocumentTypeDocumentAttribute,
+			 [NSNumber numberWithUnsignedInteger: encoding], NSCharacterEncodingDocumentAttribute,
 				nil];
 	}