diff --git a/ChangeLog b/ChangeLog
index f6f012201..10aefe19b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-18  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSPropertyList.m: Fix to cope with NSXMLParser reporting
+	whitespace as character data.
+
 2011-01-18  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSPropertyList.m: For OSX compatibility we now quote strings
diff --git a/Source/NSPropertyList.m b/Source/NSPropertyList.m
index 843b82ed0..504847e2b 100644
--- a/Source/NSPropertyList.m
+++ b/Source/NSPropertyList.m
@@ -144,7 +144,14 @@ extern BOOL GSScanDouble(unichar*, unsigned, double*);
 - (void) parser: (NSXMLParser *)parser
 foundCharacters: (NSString *)string
 {
-  [value appendString: string];
+  if (YES == inString)
+    {
+      [value appendString: string];
+    }
+  else
+    {
+      [value appendString: [string stringByTrimmingSpaces]];
+    }
 }
 
 - (void) parser: (NSXMLParser *)parser