diff --git a/ChangeLog b/ChangeLog
index 049ddb7ff..72748bfa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-14  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/NSImage.m (-guiDrawInRect:...): Handle dstRect with a zero size
+
 2011-06-14  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* Source/NSImage.m: Remove unnecessary DPSgsave/DPSgrestore I added
diff --git a/Source/NSImage.m b/Source/NSImage.m
index a64ad3c2d..a95bb8e76 100644
--- a/Source/NSImage.m
+++ b/Source/NSImage.m
@@ -1086,7 +1086,14 @@ Fallback for backends other than Cairo. */
   s = [self size];
 
   if (NSEqualRects(srcRect, NSZeroRect))
-    srcRect = NSMakeRect(0, 0, s.width, s.height);
+    {
+      srcRect.size = s;
+      /* For -drawAtPoint:fromRect:operation:fraction: used with a zero rect */
+      if (NSEqualSizes(dstRect.size, NSZeroSize))
+        {
+          dstRect.size = s;
+        }
+    }
 
   if (!dstRect.size.width || !dstRect.size.height
     || !srcRect.size.width || !srcRect.size.height)