diff --git a/ChangeLog b/ChangeLog
index cde11c8d50..e45c06eb54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-05  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkdnd-win32.c (gdk_drag_find_window_for_screen): Add
+	multi-monitor offset. (#141842, John Ehresman)
+
 2004-05-04  Federico Mena Quintero  <federico@ximian.com>
 
 	Fixes #139562, based on a patch by Christian Neumair.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cde11c8d50..e45c06eb54 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-05-05  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkdnd-win32.c (gdk_drag_find_window_for_screen): Add
+	multi-monitor offset. (#141842, John Ehresman)
+
 2004-05-04  Federico Mena Quintero  <federico@ximian.com>
 
 	Fixes #139562, based on a patch by Christian Neumair.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index cde11c8d50..e45c06eb54 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-05-05  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkdnd-win32.c (gdk_drag_find_window_for_screen): Add
+	multi-monitor offset. (#141842, John Ehresman)
+
 2004-05-04  Federico Mena Quintero  <federico@ximian.com>
 
 	Fixes #139562, based on a patch by Christian Neumair.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cde11c8d50..e45c06eb54 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-05-05  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdkdnd-win32.c (gdk_drag_find_window_for_screen): Add
+	multi-monitor offset. (#141842, John Ehresman)
+
 2004-05-04  Federico Mena Quintero  <federico@ximian.com>
 
 	Fixes #139562, based on a patch by Christian Neumair.
diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c
index f6b857b6b7..7842fdf2b8 100644
--- a/gdk/win32/gdkdnd-win32.c
+++ b/gdk/win32/gdkdnd-win32.c
@@ -1362,8 +1362,8 @@ gdk_drag_find_window_for_screen (GdkDragContext  *context,
 {
   find_window_enum_arg a;
 
-  a.x = x_root;
-  a.y = y_root;
+  a.x = x_root - _gdk_offset_x;
+  a.y = y_root - _gdk_offset_y;
   a.ignore = drag_window ? GDK_WINDOW_HWND (drag_window) : NULL;
   a.result = NULL;