diff --git a/ChangeLog b/ChangeLog
index 4de89197a..5d59588c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-03  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSData.m: Fix ([-classForCoder:]) to return base class of
+	cluster (bug #21133)
+
 2007-09-25  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/Additions/GSMime.m: Decode headers as latin1 by default if
diff --git a/Source/NSData.m b/Source/NSData.m
index 1652ab6b2..dae163d6c 100644
--- a/Source/NSData.m
+++ b/Source/NSData.m
@@ -1509,7 +1509,7 @@ failure:
 
 - (void) encodeWithCoder: (NSCoder*)coder
 {
-  if([coder allowsKeyedCoding])
+  if ([coder allowsKeyedCoding])
     {
       [coder encodeObject: self];
     }
@@ -1523,7 +1523,7 @@ failure:
 {
   id	obj = nil;
 
-  if([coder allowsKeyedCoding])
+  if ([coder allowsKeyedCoding])
     {
       obj = [coder decodeObject];
     }
@@ -2434,7 +2434,7 @@ failure:
 
 - (Class) classForCoder
 {
-  return dataMalloc;		/* Will not be static data when decoded. */
+  return NSDataAbstract;
 }
 
 /* Basic methods	*/
@@ -3070,7 +3070,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
 
 - (Class) classForCoder
 {
-  return mutableDataMalloc;
+  return NSMutableDataAbstract;
 }
 
 - (id) copy