diff --git a/ChangeLog b/ChangeLog
index 407c60b272..88bd5934d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-14  Michael Natterer  <mitch@imendio.com>
+
+	* gdk/gdkscreen.c (gdk_screen_get_property): cast the return value
+	of gdk_screen_get_font_options() to gpointer to get rid of const
+	warning.
+
 2008-01-14  Michael Natterer  <mitch@imendio.com>
 
 	* tests/testdnd.c (source_drag_data_get): fix another call to
diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
index 72aa3f7313..3695973c53 100644
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.c
@@ -506,7 +506,7 @@ gdk_screen_get_property (GObject      *object,
   switch (prop_id)
     {
     case PROP_FONT_OPTIONS:
-      g_value_set_pointer (value, gdk_screen_get_font_options (screen));
+      g_value_set_pointer (value, (gpointer) gdk_screen_get_font_options (screen));
       break;
     case PROP_RESOLUTION:
       g_value_set_double (value, gdk_screen_get_resolution (screen));