diff --git a/ChangeLog b/ChangeLog
index eadc8fb7b5..69a337833d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-06  Behdad Esfahbod  <behdad@gnome.org>
+
+	* gtk/gtksettings.c (settings_update_font_options): Turn metrics
+	hinting on (part of #307196)
+
 2005-12-06  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_key_press): Fix refcounting
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index eadc8fb7b5..69a337833d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-12-06  Behdad Esfahbod  <behdad@gnome.org>
+
+	* gtk/gtksettings.c (settings_update_font_options): Turn metrics
+	hinting on (part of #307196)
+
 2005-12-06  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_key_press): Fix refcounting
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index a9bf1199a0..363123c825 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -1404,6 +1404,10 @@ settings_update_font_options (GtkSettings *settings)
 
   options = cairo_font_options_create ();
   
+  /* hint_metrics = FALSE should never be set for user interface code.
+   */
+  cairo_font_options_set_hint_metrics (options, CAIRO_HINT_METRICS_ON);
+
   if (hinting >= 0 && !hinting)
     {
       hint_style = CAIRO_HINT_STYLE_NONE;