diff --git a/ChangeLog b/ChangeLog
index f8b6401d6..d110a6e1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-11 21:35  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/NSButtonCell.m (-drawInteriorWithFrame:inView:): Move
+	text back down by 2 points for NSImageAbove.
+
 2004-08-10 02:01  Alexander Malmberg <alexander@malmberg.org>
 
 	* Source/GSLayoutManager.m (-usedRectForTextContainer:): Fix
diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m
index 93bef5b61..1e1637307 100644
--- a/Source/NSButtonCell.m
+++ b/Source/NSButtonCell.m
@@ -942,12 +942,12 @@
 	 * The drawing code below will then center the image in imageRect.
 	 */
 	titleRect.origin.x = cellFrame.origin.x;
-	titleRect.origin.y = cellFrame.origin.y + GSCellTextImageYDist;
+	titleRect.origin.y = cellFrame.origin.y;
 	titleRect.size.width = cellFrame.size.width;
 	titleRect.size.height = titleSize.height;
 
 	imageRect.origin.x = cellFrame.origin.x;
-	imageRect.origin.y = NSMaxY(titleRect);
+	imageRect.origin.y = NSMaxY(titleRect) + GSCellTextImageYDist;
 	imageRect.size.width = cellFrame.size.width;
 	imageRect.size.height = NSMaxY(cellFrame) - imageRect.origin.y;