diff --git a/ChangeLog b/ChangeLog
index 81eeb115c..dc93cdc76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-03  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSData.m (-initWithCoder:, -encodeWithCoder): Correct
+	keyed encoding/decoding.
+
 2011-10-02  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Headers/Foundation/NSFileManager.h
@@ -11,7 +16,7 @@
 2011-10-01  Niels Grewe <niels.grewe@halbordnung.de>
 
         * Source/NSXMLNode.m: Properly implement -initWithKind: initializer.
-        Stub out some tree traversal stuff. 
+        Stub out some tree traversal stuff.
 	* Tests/base/NSXMLNode/basic.m: Fix test.
 
 	Initial work on NSXMLNode.
diff --git a/Source/NSData.m b/Source/NSData.m
index 85c6bc074..ae5443e08 100644
--- a/Source/NSData.m
+++ b/Source/NSData.m
@@ -1268,7 +1268,7 @@ failure:
 {
   if ([coder allowsKeyedCoding])
     {
-      [coder encodeObject: self];
+      [coder encodeObject: self forKey: @"NS.bytes"];
     }
   else
     {
@@ -1278,12 +1278,11 @@ failure:
 
 - (id) initWithCoder: (NSCoder*)coder
 {
-  id	obj = nil;
+  id obj = nil;
 
   if ([coder allowsKeyedCoding])
     {
-      // FIXME
-      obj = [coder decodeObject];
+      obj = [coder decodeObjectForKey: @"NS.bytes"];
     }
   else
     {