diff --git a/ChangeLog b/ChangeLog
index 2f107633c4..a675d15e9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkdnd-x11.c (gdk_drag_get_protocol_for_display): 
+	Make drops on the root window work again.  (#145243, Andrew S. Dixon)
+
 2006-01-31  Matthias Clasen  <mclasen@redhat.com>
 
 	* autogen.sh: Touch README and INSTALL here to pacify 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2f107633c4..a675d15e9c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-02-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk/x11/gdkdnd-x11.c (gdk_drag_get_protocol_for_display): 
+	Make drops on the root window work again.  (#145243, Andrew S. Dixon)
+
 2006-01-31  Matthias Clasen  <mclasen@redhat.com>
 
 	* autogen.sh: Touch README and INSTALL here to pacify 
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 09172297a0..252a030127 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -3035,8 +3035,14 @@ _gdk_drag_get_protocol_for_display (GdkDisplay      *display,
 	  GDK_NOTE (DND, g_message ("Entering local Xdnd window %#x\n", xid));
 	  return xid;
 	}
-      else
-	return None;
+      else if (_gdk_x11_display_is_root_window (display, (Window) xid))
+	{
+	  *protocol = GDK_DRAG_PROTO_ROOTWIN;
+	  GDK_NOTE (DND, g_message ("Entering root window\n"));
+	  return xid;
+	}
+      
+      return None;
     }
   
   if ((retval = xdnd_check_dest (display, xid, version)))
@@ -3104,6 +3110,7 @@ _gdk_drag_get_protocol_for_display (GdkDisplay      *display,
       if (rootwin)
 	{
 	  *protocol = GDK_DRAG_PROTO_ROOTWIN;
+	  GDK_NOTE (DND, g_message ("Entering root window\n"));
 	  return xid;
 	}
     }