diff --git a/ChangeLog b/ChangeLog
index 40f43edd77..a6def620d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-26  Bastien Nocera  <hadess@hadess.net>
+
+	Bug 569240 - Crasher when using markers
+
+	* gtk/gtkrange.c (gtk_range_destroy): Avoid crashes when destroying
+	a GtkRange with markers
+
 2009-01-26  Richard Hult  <richard@imendio.com>
 
 	Bug 566628 – gdk_display_close always asserts on win32 and quartz
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index cdf9212839..6db35b5f11 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1225,7 +1225,9 @@ gtk_range_destroy (GtkObject *object)
   if (range->layout->n_marks)
     {
       g_free (range->layout->marks);
+      range->layout->marks = NULL;
       g_free (range->layout->mark_pos);
+      range->layout->mark_pos = NULL;
       range->layout->n_marks = 0;
     }