diff --git a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
index 230505d18ef..60a8c425dbe 100644
--- a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
+++ b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
@@ -3611,7 +3611,7 @@ GetAllFontNames(void)
     if (!gGlobalList) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
-    GetFontNames("-*-*-*-*-*-*-*-*-*-*-*-*-*-*", gGlobalList);
+    GetFontNames("-*", gGlobalList);
   }
 
   return NS_OK;
diff --git a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
index 985e9af0b8f..c3821dea4a2 100644
--- a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
+++ b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
@@ -3418,7 +3418,9 @@ GetAllFontNames(void)
     if (!gGlobalList) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
-    GetFontNames("-*-*-*-*-*-*-*-*-*-*-*-*-*-*", gGlobalList);
+    /* Using "-*" instead of the full-qualified "-*-*-*-*-*-*-*-*-*-*-*-*-*-*"
+     * because it's faster and "smarter" - see bug 34242 for details. */
+    GetFontNames("-*", gGlobalList);
   }
 
   return NS_OK;