diff --git a/ChangeLog b/ChangeLog
index 8f4afa354..3a12665dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-24  Nicola Pero <nicola.pero@meta-innovation.com>
+
+	* Headers/Foundation/NSPropertList.h: Forward-declare the NSError
+	class if appropriate.
+
 2010-12-24  Nicola Pero <nicola.pero@meta-innovation.com>
 
 	* Source/NSObject.m ([+conformsToProtocol:]): Use the new code
diff --git a/Headers/Foundation/NSPropertyList.h b/Headers/Foundation/NSPropertyList.h
index 27b150fa7..7307a93cc 100644
--- a/Headers/Foundation/NSPropertyList.h
+++ b/Headers/Foundation/NSPropertyList.h
@@ -68,6 +68,7 @@ enum {
 #if OS_API_VERSION(100600,GS_API_LATEST)
 typedef NSUInteger NSPropertyListWriteOptions;
 typedef NSUInteger NSPropertyListReadOptions;
+@class NSError;
 #endif
 
 /**