diff --git a/ChangeLog b/ChangeLog
index 206c6b2b27..a5b99c74c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-30  Tor Lillqvist  <tml@novell.com>
+
+	* gtk/gtkpapersize.c (gtk_paper_size_get_paper_sizes):
+	_gtk_load_custom_papers() exists only on Unix.
+
 2007-04-30  Tor Lillqvist  <tml@novell.com>
 
 	Add functionality to set overall opacity of a top-level
diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c
index 12d23f2244..4536adbd25 100644
--- a/gtk/gtkpapersize.c
+++ b/gtk/gtkpapersize.c
@@ -452,10 +452,10 @@ gtk_paper_size_get_paper_sizes (gboolean include_custom)
 {
   GList *list = NULL;
   guint i;
-
+#ifdef G_OS_UNIX		/* _gtk_load_custom_papers() only on Unix so far  */
   if (include_custom) 
     list = _gtk_load_custom_papers ();
-
+#endif
   for (i = 0; i < G_N_ELEMENTS (standard_names_offsets); ++i)
     {
        GtkPaperSize *size;