diff --git a/ChangeLog b/ChangeLog
index 69f7a7d342..247c8822ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-09  Ross Burton  <ross@burtonini.com>
+
+	* gtk/gtkfontbutton.c:
+	Work out the font size in floating point, and display the font
+	size with %g instead of %d (#317590)
+
 2006-02-09  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/win32/gdkevents-win32.c (gdk_event_translate)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 69f7a7d342..247c8822ff 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-02-09  Ross Burton  <ross@burtonini.com>
+
+	* gtk/gtkfontbutton.c:
+	Work out the font size in floating point, and display the font
+	size with %g instead of %d (#317590)
+
 2006-02-09  Tor Lillqvist  <tml@novell.com>
 
 	* gdk/win32/gdkevents-win32.c (gdk_event_translate)
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index a0c6802a70..9f8a11bdb9 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -918,8 +918,8 @@ gtk_font_button_update_font_info (GtkFontButton *font_button)
 
   if (font_button->priv->show_size) 
     {
-      gchar *size = g_strdup_printf ("%d", 
-                                     pango_font_description_get_size (desc) / PANGO_SCALE);
+      gchar *size = g_strdup_printf ("%g",
+                                     pango_font_description_get_size (desc) / (double)PANGO_SCALE);
       
       gtk_label_set_text (GTK_LABEL (font_button->priv->size_label), size);