diff --git a/ChangeLog b/ChangeLog
index bc570ec0f..d59cea62f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-25  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSAffineTransform.m:
+        Fix decoding of keyed archive containing identity transform.
+
 2013-03-23  Fred Kiefer <FredKiefer@gmx.de>
 
         * Source/NSXMLNode.m (-XMLStringWithOptions:): Revert change I
@@ -1098,16 +1103,16 @@
 
 2012-04-07 13:54  theraven
 
-	* libs/base/trunk/Source/NSMethodSignature.m: Fix NSMethodSignature
+	* Source/NSMethodSignature.m: Fix NSMethodSignature
 	generating nonsense values when it encounters a type encoding
 	including blocks.
 
 2012-04-07 10:45  theraven
 
-	* libs/base/trunk/Source/GSSocketStream.m,
-	libs/base/trunk/Source/NSAffineTransform.m,
-	libs/base/trunk/Source/NSXMLDTDNode.m,
-	libs/base/trunk/Tools/xmlparse.m: Fix the remaining compiler
+	* Source/GSSocketStream.m:
+	* Source/NSAffineTransform.m:
+	* Source/NSXMLDTDNode.m:
+	* Tools/xmlparse.m: Fix the remaining compiler
 	warnings.
 
 2012-04-07  Fred Kiefer <FredKiefer@gmx.de>
diff --git a/Source/NSAffineTransform.m b/Source/NSAffineTransform.m
index 4031329ec..5244a800f 100644
--- a/Source/NSAffineTransform.m
+++ b/Source/NSAffineTransform.m
@@ -672,6 +672,10 @@ static NSAffineTransformStruct identityTransform = {
               return [self notImplemented: _cmd];
             }
         }
+      else
+        {
+          replace = identityTransform;
+        }
     }
   else
     {
diff --git a/Tests/base/NSAffineTransform/basic.m b/Tests/base/NSAffineTransform/basic.m
index 579c27466..3c06a5487 100644
--- a/Tests/base/NSAffineTransform/basic.m
+++ b/Tests/base/NSAffineTransform/basic.m
@@ -61,7 +61,7 @@ int main()
    
   test_NSObject(@"NSAffineTransform", testObjs);
   test_NSCoding(testObjs);
-//  test_keyed_NSCoding(testObjs);
+  test_keyed_NSCoding(testObjs);
   test_NSCopying(@"NSAffineTransform", @"NSAffineTransform", testObjs, NO, YES);
   
   testObj = [NSAffineTransform transform];