diff --git a/ChangeLog b/ChangeLog
index 2bc765d71b..9d76147265 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-15  Torsten Schoenfeld  <kaffeetisch@gmx.de>
+
+	* gtk/gtkprintoperation.c (pdf_end_run): Unset priv->platform_data and
+	priv->free_platform_data to prevent gtk_print_operation_finalize()
+	from freeing the cairo surface a second time.
+
 2007-05-14  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtkfilechooserdefault.c (recent_column_path_sort_func): remove
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index cc8e077d71..4c0562e0a9 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -1807,6 +1807,9 @@ pdf_end_run (GtkPrintOperation *op,
 
   cairo_surface_finish (surface);
   cairo_surface_destroy (surface);
+
+  priv->platform_data = NULL;
+  priv->free_platform_data = NULL;
 }
 
 static GtkPrintOperationResult