diff --git a/ChangeLog b/ChangeLog
index 528efac8fb..8bd7155df8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconview.c (gtk_icon_view_button_press): Reset 
+	pressed_button to -1 after handling a double click, so that
+	motion events occurring between here and the release event
+	don't trigger DND.  (#324588, Dave Andreoli)
+
 2005-12-14  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkcontainer.c (_gtk_container_focus_sort): Skip unrealized
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 528efac8fb..8bd7155df8 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-12-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkiconview.c (gtk_icon_view_button_press): Reset 
+	pressed_button to -1 after handling a double click, so that
+	motion events occurring between here and the release event
+	don't trigger DND.  (#324588, Dave Andreoli)
+
 2005-12-14  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkcontainer.c (_gtk_container_focus_sort): Skip unrealized
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index aa0f554ddb..0ed15e8467 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -1961,6 +1961,7 @@ gtk_icon_view_button_press (GtkWidget      *widget,
 	}
 
       icon_view->priv->last_single_clicked = NULL;
+      icon_view->priv->pressed_button = -1;
     }
   
   if (dirty)