diff --git a/ChangeLog b/ChangeLog
index 9918e5dfc7..e368f71867 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_finalize): 
+	Don't leak expander pixbufs.  (#316946, Tommi Komulainen)
+
 2005-09-22  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkwidget.c (gtk_widget_class_init): Fix the documentation
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9918e5dfc7..e368f71867 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-09-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_finalize): 
+	Don't leak expander pixbufs.  (#316946, Tommi Komulainen)
+
 2005-09-22  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkwidget.c (gtk_widget_class_init): Fix the documentation
diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index 0760428945..972b24d09d 100644
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -238,6 +238,10 @@ gtk_cell_renderer_pixbuf_finalize (GObject *object)
   
   if (cellpixbuf->pixbuf)
     g_object_unref (cellpixbuf->pixbuf);
+  if (cellpixbuf->pixbuf_expander_open)
+    g_object_unref (cellpixbuf->pixbuf_expander_open);
+  if (cellpixbuf->pixbuf_expander_closed)
+    g_object_unref (cellpixbuf->pixbuf_expander_closed);
 
   g_free (priv->stock_id);
   g_free (priv->stock_detail);