diff --git a/ChangeLog b/ChangeLog
index 0ad40a145a..6b10ac4e3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-29  Dave Camp  <dave@ximian.com>
+
+	* gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events.
+
 2002-05-27  Daniel Elstner  <daniel.elstner@gmx.net>
 
 	Fixes for #83190
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0ad40a145a..6b10ac4e3b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2002-05-29  Dave Camp  <dave@ximian.com>
+
+	* gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events.
+
 2002-05-27  Daniel Elstner  <daniel.elstner@gmx.net>
 
 	Fixes for #83190
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0ad40a145a..6b10ac4e3b 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2002-05-29  Dave Camp  <dave@ximian.com>
+
+	* gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events.
+
 2002-05-27  Daniel Elstner  <daniel.elstner@gmx.net>
 
 	Fixes for #83190
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0ad40a145a..6b10ac4e3b 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2002-05-29  Dave Camp  <dave@ximian.com>
+
+	* gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events.
+
 2002-05-27  Daniel Elstner  <daniel.elstner@gmx.net>
 
 	Fixes for #83190
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0ad40a145a..6b10ac4e3b 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2002-05-29  Dave Camp  <dave@ximian.com>
+
+	* gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events.
+
 2002-05-27  Daniel Elstner  <daniel.elstner@gmx.net>
 
 	Fixes for #83190
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0ad40a145a..6b10ac4e3b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2002-05-29  Dave Camp  <dave@ximian.com>
+
+	* gtk/gtkdnd.c (gtk_drag_end): Disconnect from keypress events.
+
 2002-05-27  Daniel Elstner  <daniel.elstner@gmx.net>
 
 	Fixes for #83190
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index cf50b769be..f05a65725c 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -3009,6 +3009,9 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time)
   gtk_signal_disconnect_by_func (GTK_OBJECT (info->ipc_widget), 
 				 GTK_SIGNAL_FUNC (gtk_drag_motion_cb),
 				 info);
+  gtk_signal_disconnect_by_func (GTK_OBJECT (info->ipc_widget), 
+				 GTK_SIGNAL_FUNC (gtk_drag_key_cb),
+				 info);
 
   /* Send on a release pair to the the original 
    * widget to convince it to release its grab. We need to