diff --git a/ChangeLog b/ChangeLog
index 0ab82e678..9c4e20b4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,11 @@ Tue Oct 14  1999  Nicola Pero  <n.pero@mi.flashnet.it>
 	* Source/NSWindow.m ([-keyDown:]): Use NSCommandKeyMask for key
  	equivalents.
 	
+Tue Oct 14  1999  Lyndon Tremblay <humasect@coolmail.com>
+
+	* Source/NSMatrix.m: ([-initWithFrame:]): Changed default cellSize
+	to be convient and match NSMatrix's frame.
+
 Wed Oct 13  1999  Nicola Pero  <n.pero@mi.flashnet.it>
 
 	You should now be able to use key equivalents for buttons.  
diff --git a/Source/NSMatrix.m b/Source/NSMatrix.m
index 2978780a4..a0956951e 100644
--- a/Source/NSMatrix.m
+++ b/Source/NSMatrix.m
@@ -358,7 +358,8 @@ static int mouseDownFlags = 0;
   mode = aMode;
   [self setFrame: frameRect];
 
-  cellSize = NSMakeSize(DEFAULT_CELL_WIDTH, DEFAULT_CELL_HEIGHT);
+  /* cellSize = NSMakeSize(DEFAULT_CELL_WIDTH, DEFAULT_CELL_HEIGHT); */
+  cellSize = NSMakeSize(frameRect.size.width/numCols, frameRect.size.height/numRows);
   intercell = NSMakeSize(1, 1);
   [self setBackgroundColor: [NSColor controlBackgroundColor]];
   [self setDrawsBackground: YES];