diff --git a/ChangeLog b/ChangeLog
index 58be6e8e0..068a30c07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-22 13:06  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/NSActionCell.m (-encodeWithCoder:): Encode nil instead of
+	the control view.
+
 2004-01-22 13:04  Alexander Malmberg <alexander@malmberg.org>
 
 	* Headers/Additions/GNUstepGUI/GSDrawFunctions.h: Add missing
diff --git a/Source/NSActionCell.m b/Source/NSActionCell.m
index 3a3c66d97..eee827cea 100644
--- a/Source/NSActionCell.m
+++ b/Source/NSActionCell.m
@@ -319,8 +319,8 @@ static Class controlClass;
   [aCoder encodeValueOfObjCType: @encode(int) at: &_tag];
   [aCoder encodeConditionalObject: _target];
   [aCoder encodeValueOfObjCType: @encode(SEL) at: &_action];
-  // This is only encoded for backward compatibility and wont be decoded.
-  [aCoder encodeConditionalObject: _control_view];
+  // This is only encoded for backward compatibility and won't be decoded.
+  [aCoder encodeConditionalObject: nil];
 }
 
 - (id) initWithCoder: (NSCoder*)aDecoder
@@ -331,7 +331,7 @@ static Class controlClass;
   [aDecoder decodeValueOfObjCType: @encode(int) at: &_tag];
   _target = [aDecoder decodeObject];
   [aDecoder decodeValueOfObjCType: @encode(SEL) at: &_action];
-  // Don't decode _control_view, as this may no longe be valid.
+  // Don't decode _control_view, as this may no longer be valid.
   dummy = [aDecoder decodeObject];
   return self;
 }