diff --git a/ChangeLog b/ChangeLog
index cd40e2f60..c970476f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-30 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSClipView.m: ([scrollToPoint]) reset cursor rectangles when
+	view is scrolled.
+
 2007-11-29 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSWindowController.m:
diff --git a/Source/NSClipView.m b/Source/NSClipView.m
index ab44bfe03..8185e2028 100644
--- a/Source/NSClipView.m
+++ b/Source/NSClipView.m
@@ -214,6 +214,7 @@ static inline NSRect integralRect (NSRect rect, NSView *view)
 - (void) scrollToPoint: (NSPoint)aPoint
 {
   [self setBoundsOrigin: [self constrainScrollPoint: aPoint]];
+  [self resetCursorRects];
 }
 
 - (void) setBounds: (NSRect)b