--- gtk+-2.20.1.orig/gtk/gtkpapersize.c	2010-05-07 10:31:12.000000000 +0100
+++ gtk+-2.20.1/gtk/gtkpapersize.c	2010-05-07 10:30:58.000000000 +0100
@@ -669,11 +669,10 @@
   if (!locale)
     return GTK_PAPER_NAME_A4;
 
-  /* CLDR 1.8.1
-   * http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/territory_language_information.html
-   */
-  if (g_regex_match_simple("[^_.@]{2,3}_(BZ|CA|CL|CR|SV|GT|MX|NI|PA|PH|PR|US|VE)",
-                           locale, G_REGEX_ANCHORED, G_REGEX_MATCH_ANCHORED))
+  if (g_str_has_prefix (locale, "en_CA") ||
+      g_str_has_prefix (locale, "en_US") ||
+      g_str_has_prefix (locale, "es_PR") ||
+      g_str_has_prefix (locale, "es_US"))
     paper_size = GTK_PAPER_NAME_LETTER;
   else
     paper_size = GTK_PAPER_NAME_A4;
