diff --git a/ChangeLog b/ChangeLog
index 086ea140f..b98a95d26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-09  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/NSMatrix.m (-setState:atRow:column:): Fix bug where the
+	old selected cell wasn't properly deselected when the matrix's
+	mode is NSRadioMatrixMode.
+
 2010-12-09  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/NSLayoutManager.m (-rectArrayForGlyphRange:...): Clip the
diff --git a/Source/NSMatrix.m b/Source/NSMatrix.m
index 15abf252b..8e03a2fbe 100644
--- a/Source/NSMatrix.m
+++ b/Source/NSMatrix.m
@@ -1040,6 +1040,10 @@ static SEL getSel;
 	  if (_selectedRow > -1 && _selectedColumn > -1)
 	    {
 	      _selectedCells[_selectedRow][_selectedColumn] = NO;
+	      [_selectedCell setState: NSOffState];
+	      [self setNeedsDisplayInRect:
+		     [self cellFrameAtRow: _selectedRow
+				   column: _selectedColumn]];
 	    }
 
 	  _selectedCell = aCell;