diff --git a/ChangeLog b/ChangeLog
index 5250c77311..3f4046b5e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-03  Marek Kasik  <mkasik@redhat.com>
+
+	Bug 559914 – eog doesn't apply paper setup.
+
+	* gtk/gtkpapersize.c: Call the gtk_paper_size_new_from_ppd() with width
+	and height in points.
+
 2008-12-02  Carlos Garcia Campos  <carlosgc@gnome.org>
 
 	Bug 562878 – password save incorrectly set in gtkmountoperation
diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c
index 5aa64b0f9d..a806ae8d95 100644
--- a/gtk/gtkpapersize.c
+++ b/gtk/gtkpapersize.c
@@ -852,8 +852,10 @@ gtk_paper_size_new_from_key_file (GKeyFile    *key_file,
     display_name = g_strdup (name);
 
   if (ppd_name != NULL)
-    paper_size = gtk_paper_size_new_from_ppd (ppd_name, display_name,
-			                      width, height);
+    paper_size = gtk_paper_size_new_from_ppd (ppd_name,
+                                              display_name,
+                                              _gtk_print_convert_from_mm (width, GTK_UNIT_POINTS),
+                                              _gtk_print_convert_from_mm (height, GTK_UNIT_POINTS));
   else if (name != NULL)
     paper_size = gtk_paper_size_new_custom (name, display_name,
 					    width, height, GTK_UNIT_MM);