diff -u gnome-screensaver-2.17.8/debian/changelog gnome-screensaver-2.17.8/debian/changelog
--- gnome-screensaver-2.17.8/debian/changelog
+++ gnome-screensaver-2.17.8/debian/changelog
@@ -1,3 +1,11 @@
+gnome-screensaver (2.17.8-0ubuntu2) feisty; urgency=low
+  * debian/patches/02_ghost_mouse.patch:
+    - Make gnome-screensaver not watch for mouse motion events from windows
+      which haven't registered for such events (LP: #84662)
+      Thanks to William Lachance for the patch
+
+ -- Jonh Wendell <wendell@ubuntu.com>  Wed, 28 Feb 2007 09:45:05 -0300
+
 gnome-screensaver (2.17.8-0ubuntu1) feisty; urgency=low
 
   * add build deps on libxkbfile-dev and libgnomekbdui-dev
only in patch2:
unchanged:
--- gnome-screensaver-2.17.8.orig/debian/patches/02_ghost_mouse.patch
+++ gnome-screensaver-2.17.8/debian/patches/02_ghost_mouse.patch
@@ -0,0 +1,25 @@
+diff -Nur gnome-screensaver-2.17.8/src/gs-watcher-x11.c gnome-screensaver-2.17.8.new/src/gs-watcher-x11.c
+--- gnome-screensaver-2.17.8/src/gs-watcher-x11.c	2007-02-23 01:39:09.000000000 -0300
++++ gnome-screensaver-2.17.8.new/src/gs-watcher-x11.c	2007-02-28 09:41:56.000000000 -0300
+@@ -306,15 +306,17 @@
+                 /* Keep already selected events.  This is important when the
+                    window == GDK_ROOT_WINDOW () since the mask will contain
+                    StructureNotifyMask that is essential for RANDR support */
+-                events = attrs.your_event_mask | events;
++                events |= attrs.your_event_mask;
+ 
+                 /* Select for SubstructureNotify on all windows */
+-                events = SubstructureNotifyMask | events;
++                events |= SubstructureNotifyMask;
+ 
+                 /* Select for PropertyNotify events to get user time changes */
+-                events = PropertyChangeMask | events;
++                events |= PropertyChangeMask;
+ 
+-                events = PointerMotionMask | PointerMotionHintMask | events;
++                /* As with keypress events, only select mouse motion events
++                   for windows which already have them selected. */
++                events |= ((attrs.all_event_masks | attrs.do_not_propagate_mask) & (PointerMotionMask | PointerMotionHintMask));
+         } else {
+                 /* We want to disable all events */
+