diff --git a/ChangeLog b/ChangeLog
index 62941bb19..328f25e10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-23  Havoc Pennington  <hp@pobox.com>
+
+	* src/ui.c (meta_ui_init): fix the
+	be-sure-we-create-coverage-cache hack
+
 2002-02-19  Havoc Pennington  <hp@pobox.com>
 
 	* src/ui.c (meta_ui_init): put in hack to keep Pango from mangling
diff --git a/src/ui.c b/src/ui.c
index fdeb5c5bf..a4062aaf9 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -44,13 +44,26 @@ meta_ui_init (int *argc, char ***argv)
   if (!gtk_init_check (argc, argv))
     meta_fatal ("Unable to open X display %s\n", XDisplayName (NULL));
 
-  /* FIXME hackaround for Pango opening a separate display
-   * connection and doing a server grab while we have a grab
-   * on the primary display connection. This forces Pango to
-   * go ahead and do its font cache before we try to grab
-   * the server.
-   */
-  pango_x_font_map_for_display (gdk_display);
+  {
+    /* FIXME hackaround for Pango opening a separate display
+     * connection and doing a server grab while we have a grab
+     * on the primary display connection. This forces Pango to
+     * go ahead and do its font cache before we try to grab
+     * the server.
+     */  
+    PangoFontMetrics *metrics;
+    PangoLanguage *lang;
+    PangoContext *context;
+    PangoFontDescription *font_desc;
+
+    context = gdk_pango_context_get ();
+    lang = gtk_get_default_language ();
+    font_desc = pango_font_description_from_string ("Sans 12");
+    metrics = pango_context_get_metrics (context, font_desc, lang);    
+    
+    pango_font_metrics_unref (metrics);
+    pango_font_description_free (font_desc);
+  }
 }
 
 Display*