diff --git a/ChangeLog b/ChangeLog
index be79ad9d1..2a268ec69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+011-05-07  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/NSView.m (-convertPoint:toView:): Correct this
+	method; it was applying the transforms backwards :-(
+
 2011-05-05  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* Tests/gui/NSView/NSView_frame_bounds.m: Add some more tests
diff --git a/Source/NSView.m b/Source/NSView.m
index 460821f29..fca5e7ac0 100644
--- a/Source/NSView.m
+++ b/Source/NSView.m
@@ -1658,12 +1658,12 @@ GSSetDragTypes(NSView* obj, NSArray *types)
   if (aView == self)
     return aPoint;
 
-  inBase = [[self _matrixFromWindow] transformPoint: aPoint];
+  inBase = [[self _matrixToWindow] transformPoint: aPoint];
 
   if (aView != nil)
     {
       NSAssert(_window == [aView window], NSInvalidArgumentException);      
-      return [[aView _matrixToWindow] transformPoint: inBase];
+      return [[aView _matrixFromWindow] transformPoint: inBase];
     }
   else
     {