diff --git a/ChangeLog b/ChangeLog
index 705775b888..5002b46a4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 10 23:35:13 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkentry.c (paste_received): Make middle-button pasting
+	work as expected inside the entry.  (#116789, Scott Bronson)
+
 Sat Jul 10 22:13:53 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktextbuffer.c (gtk_text_buffer_select_range): Update 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 705775b888..5002b46a4e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Jul 10 23:35:13 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkentry.c (paste_received): Make middle-button pasting
+	work as expected inside the entry.  (#116789, Scott Bronson)
+
 Sat Jul 10 22:13:53 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktextbuffer.c (gtk_text_buffer_select_range): Update 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 705775b888..5002b46a4e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Jul 10 23:35:13 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkentry.c (paste_received): Make middle-button pasting
+	work as expected inside the entry.  (#116789, Scott Bronson)
+
 Sat Jul 10 22:13:53 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktextbuffer.c (gtk_text_buffer_select_range): Update 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 705775b888..5002b46a4e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Jul 10 23:35:13 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/gtkentry.c (paste_received): Make middle-button pasting
+	work as expected inside the entry.  (#116789, Scott Bronson)
+
 Sat Jul 10 22:13:53 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktextbuffer.c (gtk_text_buffer_select_range): Update 
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 699101a626..c797d846d6 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -73,6 +73,7 @@ typedef struct _GtkEntryPrivate GtkEntryPrivate;
 struct _GtkEntryPrivate 
 {
   gfloat xalign;
+  gint insert_pos;
 };
 
 enum {
@@ -1369,6 +1370,7 @@ gtk_entry_button_press (GtkWidget      *widget,
 {
   GtkEntry *entry = GTK_ENTRY (widget);
   GtkEditable *editable = GTK_EDITABLE (widget);
+  GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
   gint tmp_pos;
   gint sel_start, sel_end;
 
@@ -1497,7 +1499,7 @@ gtk_entry_button_press (GtkWidget      *widget,
     }
   else if (event->button == 2 && event->type == GDK_BUTTON_PRESS && entry->editable)
     {
-      gtk_editable_select_region (editable, tmp_pos, tmp_pos);
+      priv->insert_pos = tmp_pos;
       gtk_entry_paste (entry, GDK_SELECTION_PRIMARY);
 
       return TRUE;
@@ -3480,6 +3482,16 @@ paste_received (GtkClipboard *clipboard,
 {
   GtkEntry *entry = GTK_ENTRY (data);
   GtkEditable *editable = GTK_EDITABLE (entry);
+  GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+      
+  if (entry->button == 2)
+    {
+      gint pos, start, end;
+      pos = priv->insert_pos;
+      gtk_editable_get_selection_bounds (editable, &start, &end);
+      if (!((start <= pos && pos <= end) || (end <= pos && pos <= start)))
+	gtk_editable_select_region (editable, pos, pos);
+    }
       
   if (text)
     {
@@ -3492,7 +3504,7 @@ paste_received (GtkClipboard *clipboard,
 	  if (GTK_WIDGET_MAPPED (completion->priv->popup_window))
 	    _gtk_entry_completion_popdown (completion);
 	}
-      
+
       if (gtk_editable_get_selection_bounds (editable, &start, &end))
         gtk_editable_delete_text (editable, start, end);