diff --git a/ChangeLog b/ChangeLog
index 4f6a87f70a..2b7f667a2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-23  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+	* gtk/gtkpagesetup.c
+	(gtk_page_setup_set_paper_size_and_default_margins): Fix memory leak.
+	Fixes bug #399907. 
+
 2007-01-22  Chris Wilson <chris@chris-wilson.co.uk>
 
 	Bug 399314 – Add G_GNUC_WARN_UNUSED_RESULT to gtk_style_attach
diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c
index 9db0fc719d..c216dc8706 100644
--- a/gtk/gtkpagesetup.c
+++ b/gtk/gtkpagesetup.c
@@ -210,7 +210,7 @@ void
 gtk_page_setup_set_paper_size_and_default_margins (GtkPageSetup *setup,
 						   GtkPaperSize *size)
 {
-  setup->paper_size = gtk_paper_size_copy (size);
+  gtk_page_setup_set_paper_size (setup, size);
   setup->top_margin = gtk_paper_size_get_default_top_margin (setup->paper_size, GTK_UNIT_MM);
   setup->bottom_margin = gtk_paper_size_get_default_bottom_margin (setup->paper_size, GTK_UNIT_MM);
   setup->left_margin = gtk_paper_size_get_default_left_margin (setup->paper_size, GTK_UNIT_MM);