diff --git a/ChangeLog b/ChangeLog
index a747a088c2..746361fa8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-11  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktextview.c (gtk_text_view_set_buffer): Set first_para_mark
+	to NULL.  (#396805, Colin Leroy, patch by Mariano Suárez-Alvarez)
+	
 2007-03-12  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtkfilechooserdefault.c (check_save_entry): immediately
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 2eff8e2ca0..223ffc99d3 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -1177,6 +1177,7 @@ gtk_text_view_set_buffer (GtkTextView   *text_view,
                                             text_view);
       g_object_unref (text_view->buffer);
       text_view->dnd_mark = NULL;
+      text_view->first_para_mark = NULL;
 
       if (GTK_WIDGET_REALIZED (text_view))
 	{