diff --git a/debian/changelog b/debian/changelog
index 293597f299..91961527e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gtk+2.0 (2.18.9-2) unstable; urgency=low
+
+  * debian/patches/006_gtkentry_avoid_spurious_notifications.patch:
+    - Backport patch from upstream git, don't set the buffer to null
+      to avoid extra notifications. Closes: #574896.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Mon, 22 Mar 2010 17:04:30 +0100
+
 gtk+2.0 (2.18.9-1) unstable; urgency=low
 
   [ Cyril Brulebois ]
diff --git a/debian/patches/006_gtkentry_avoid_spurious_notifications.patch b/debian/patches/006_gtkentry_avoid_spurious_notifications.patch
new file mode 100644
index 0000000000..9ce97f3303
--- /dev/null
+++ b/debian/patches/006_gtkentry_avoid_spurious_notifications.patch
@@ -0,0 +1,36 @@
+From 0fff51eab6427ca4d0ab679c1d994a2a36898a7d Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Sat, 20 Mar 2010 03:20:38 +0000
+Subject: Avoid spurious notifications from GtkEntry
+
+Using gtk_entry_set_buffer() in dispose() causes problematic
+notifications, so just get rid of the buffer manually. See bug 613241.
+(cherry picked from commit 5f29a679f8a31b6548f34179d65a39de9ec63535)
+---
+diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
+index 4344449..0dafcf7 100644
+--- a/gtk/gtkentry.c
++++ b/gtk/gtkentry.c
+@@ -2425,12 +2425,19 @@ static void
+ gtk_entry_dispose (GObject *object)
+ {
+   GtkEntry *entry = GTK_ENTRY (object);
++  GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ 
+   gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, NULL);
+   gtk_entry_set_icon_tooltip_markup (entry, GTK_ENTRY_ICON_PRIMARY, NULL);
+   gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_SECONDARY, NULL);
+   gtk_entry_set_icon_tooltip_markup (entry, GTK_ENTRY_ICON_SECONDARY, NULL);
+-  gtk_entry_set_buffer (entry, NULL);
++
++  if (priv->buffer)
++    {
++      buffer_disconnect_signals (entry);
++      g_object_unref (priv->buffer);
++      priv->buffer = NULL;
++    }
+ 
+   G_OBJECT_CLASS (gtk_entry_parent_class)->dispose (object);
+ }
+--
+cgit v0.8.3.1
diff --git a/debian/patches/series b/debian/patches/series
index d436dc8a74..307ff69901 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@
 003_gdk.pc_privates.patch
 004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
 005_support_disabling_x11_extensions.patch
+006_gtkentry_avoid_spurious_notifications.patch
 009_gtk-export-filechooser.patch
 010_gdkpixbuf_-lm.patch
 015_default-fallback-icon-theme.patch