diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf63cacf728..8b7e5f1525b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-24  Chong Yidong  <cyd@stupidchicken.com>
+
+	* mouse.el (mouse-drag-track): Set scroll-margin to 0 while
+	tracking (Bug#9541).
+
 2011-09-24  Ulf Jasper  <ulf.jasper@web.de>
 
 	* net/newst-reader.el (newsticker-html-renderer)
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 63395619f44..8a74782250d 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -904,7 +904,8 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
   (mouse-minibuffer-check start-event)
   (setq mouse-selection-click-count-buffer (current-buffer))
   (deactivate-mark)
-  (let* ((original-window (selected-window))
+  (let* ((scroll-margin 0) ; Avoid margin scrolling (Bug#9541).
+	 (original-window (selected-window))
          ;; We've recorded what we needed from the current buffer and
          ;; window, now let's jump to the place of the event, where things
          ;; are happening.