diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 5c636dadf4..523f771dab 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -62,7 +62,7 @@ struct _GtkComposeTableCompact
 static const GtkComposeTableCompact gtk_compose_table_compact = {
   gtk_compose_seqs_compact,
   5,
-  23,
+  24,
   6
 };
 
diff --git a/gtk/gtkimcontextsimpleseqs.h b/gtk/gtkimcontextsimpleseqs.h
index 9e3fc29e99..131b3db6e1 100644
--- a/gtk/gtkimcontextsimpleseqs.h
+++ b/gtk/gtkimcontextsimpleseqs.h
@@ -18,10 +18,9 @@
  */
 
 /*
- * File auto-generated from script found at gtk/compose-parse.py, with the --gtk parameter,
+ * File auto-generated from script found at http://bugzilla.gnome.org/show_bug.cgi?id=321896
  * using the input files
  *  Input   : http://gitweb.freedesktop.org/?p=xorg/lib/libX11.git;a=blob_plain;f=nls/en_US.UTF-8/Compose.pre
- *  Input   : http://svn.gnome.org/viewcvs/gtk%2B/trunk/gtk/gtk-compose-lookaside.txt
  *  Input   : http://www.cl.cam.ac.uk/~mgk25/ucs/keysyms.txt
  *  Input   : http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
  *
@@ -68,29 +67,30 @@
  */
 
 static const guint16 gtk_compose_seqs_compact[] = {
-GDK_dead_stroke, 138, 226, 235, 235, 235, 
-GDK_Greek_accentdieresis, 235, 239, 239, 239, 239, 
-GDK_dead_grave, 239, 299, 386, 598, 598, 
-GDK_dead_acute, 598, 664, 760, 1036, 1036, 
-GDK_dead_circumflex, 1036, 1176, 1176, 1376, 1376, 
-GDK_dead_tilde, 1376, 1458, 1521, 1661, 1661, 
-GDK_dead_macron, 1661, 1707, 1707, 1779, 1779, 
-GDK_dead_breve, 1779, 1833, 1833, 1857, 1857, 
-GDK_dead_abovedot, 1857, 1887, 1890, 1922, 1922, 
-GDK_dead_diaeresis, 1922, 2010, 2019, 2043, 2043, 
-GDK_dead_abovering, 2043, 2053, 2053, 2053, 2053, 
-GDK_dead_doubleacute, 2053, 2063, 2063, 2063, 2063, 
-GDK_dead_caron, 2063, 2089, 2089, 2097, 2097, 
-GDK_dead_cedilla, 2097, 2111, 2111, 2111, 2111, 
-GDK_dead_ogonek, 2111, 2121, 2121, 2121, 2121, 
-GDK_dead_iota, 2121, 2143, 2242, 2674, 3334, 
-GDK_dead_voiced_sound, 3334, 3380, 3380, 3380, 3380, 
-GDK_dead_semivoiced_sound, 3380, 3390, 3390, 3390, 3390, 
-GDK_dead_belowdot, 3390, 3400, 3400, 3416, 3416, 
-GDK_dead_hook, 3416, 3494, 3494, 3550, 3550, 
-GDK_dead_psili, 3550, 3578, 3578, 3578, 3578, 
-GDK_dead_dasia, 3578, 3610, 3610, 3610, 3610, 
-GDK_Multi_key, 3610, 3610, 9589, 13297, 15157, 
+GDK_dead_stroke, 144, 232, 241, 241, 241, 
+GDK_Greek_accentdieresis, 241, 245, 245, 245, 245, 
+GDK_dead_grave, 245, 307, 394, 606, 606, 
+GDK_dead_acute, 606, 674, 770, 1046, 1046, 
+GDK_dead_circumflex, 1046, 1186, 1186, 1386, 1386, 
+GDK_dead_tilde, 1386, 1470, 1533, 1673, 1673, 
+GDK_dead_macron, 1673, 1719, 1719, 1791, 1791, 
+GDK_dead_breve, 1791, 1845, 1845, 1869, 1869, 
+GDK_dead_abovedot, 1869, 1899, 1902, 1934, 1934, 
+GDK_dead_diaeresis, 1934, 2022, 2031, 2055, 2055, 
+GDK_dead_abovering, 2055, 2065, 2065, 2065, 2065, 
+GDK_dead_doubleacute, 2065, 2075, 2075, 2075, 2075, 
+GDK_dead_caron, 2075, 2121, 2121, 2129, 2129, 
+GDK_dead_cedilla, 2129, 2143, 2143, 2143, 2143, 
+GDK_dead_ogonek, 2143, 2153, 2153, 2153, 2153, 
+GDK_dead_iota, 2153, 2175, 2274, 2706, 3366, 
+GDK_dead_voiced_sound, 3366, 3412, 3412, 3412, 3412, 
+GDK_dead_semivoiced_sound, 3412, 3422, 3422, 3422, 3422, 
+GDK_dead_belowdot, 3422, 3438, 3438, 3454, 3454, 
+GDK_dead_hook, 3454, 3532, 3532, 3588, 3588, 
+GDK_dead_horn, 3588, 3598, 3598, 3598, 3598, 
+GDK_dead_psili, 3598, 3626, 3626, 3626, 3626, 
+GDK_dead_dasia, 3626, 3658, 3658, 3658, 3658, 
+GDK_Multi_key, 3658, 3658, 9658, 13366, 15231, 
 GDK_space, 0x002F, 
 GDK_2, 0x01BB, 
 GDK_A, 0x023A, 
@@ -143,6 +143,7 @@ GDK_Greek_upsilon, 0x03B0,
 GDK_space, 0x0060, 
 GDK_V, 0x01DB, 
 GDK_v, 0x01DC, 
+GDK_nobreakspace, 0x0300, 
 GDK_Abreve, 0x1EB0, 
 GDK_abreve, 0x1EB1, 
 GDK_Emacron, 0x1E14, 
@@ -255,6 +256,7 @@ GDK_Multi_key, GDK_macron, GDK_o, 0x1E51,
 GDK_space, 0x0027, 
 GDK_V, 0x01D7, 
 GDK_v, 0x01D8, 
+GDK_nobreakspace, 0x0301, 
 GDK_Abreve, 0x1EAE, 
 GDK_abreve, 0x1EAF, 
 GDK_Emacron, 0x1E16, 
@@ -510,6 +512,7 @@ GDK_space, 0x007E,
 GDK_less, 0x2272, 
 GDK_equal, 0x2243, 
 GDK_greater, 0x2273, 
+GDK_nobreakspace, 0x0303, 
 GDK_Oacute, 0x1E4C, 
 GDK_Odiaeresis, 0x1E4E, 
 GDK_Uacute, 0x1E78, 
@@ -769,6 +772,16 @@ GDK_parenleft, 0x208D,
 GDK_parenright, 0x208E, 
 GDK_plus, 0x208A, 
 GDK_minus, 0x208B, 
+GDK_0, 0x2080, 
+GDK_1, 0x2081, 
+GDK_2, 0x2082, 
+GDK_3, 0x2083, 
+GDK_4, 0x2084, 
+GDK_5, 0x2085, 
+GDK_6, 0x2086, 
+GDK_7, 0x2087, 
+GDK_8, 0x2088, 
+GDK_9, 0x2088, 
 GDK_equal, 0x208C, 
 GDK_V, 0x01D9, 
 GDK_v, 0x01DA, 
@@ -1103,11 +1116,14 @@ GDK_kana_HI, 0x30D4,
 GDK_kana_FU, 0x30D7, 
 GDK_kana_HE, 0x30DA, 
 GDK_kana_HO, 0x30DD, 
+GDK_space, 0x0323, 
 GDK_plus, 0x2A25, 
 GDK_minus, 0x2A2A, 
 GDK_equal, 0x2A66, 
+GDK_nobreakspace, 0x0323, 
 GDK_Abreve, 0x1EB6, 
 GDK_abreve, 0x1EB7, 
+GDK_dead_belowdot, 0x0323, 
 GDK_Multi_key, GDK_plus, GDK_O, 0x1EE2, 
 GDK_Multi_key, GDK_plus, GDK_U, 0x1EF0, 
 GDK_Multi_key, GDK_plus, GDK_o, 0x1EE3, 
@@ -1165,6 +1181,11 @@ GDK_Multi_key, GDK_asciicircum, GDK_e, 0x1EC3,
 GDK_Multi_key, GDK_asciicircum, GDK_o, 0x1ED5, 
 GDK_Multi_key, GDK_b, GDK_A, 0x1EB2, 
 GDK_Multi_key, GDK_b, GDK_a, 0x1EB3, 
+GDK_space, 0x031B, 
+GDK_nobreakspace, 0x031B, 
+GDK_Utilde, 0x1EEE, 
+GDK_utilde, 0x1EEF, 
+GDK_dead_horn, 0x031B, 
 GDK_Greek_ALPHA, 0x1F08, 
 GDK_Greek_EPSILON, 0x1F18, 
 GDK_Greek_ETA, 0x1F28, 
@@ -1368,7 +1389,7 @@ GDK_apostrophe, GDK_Idiaeresis, 0x1E2E,
 GDK_apostrophe, GDK_Ocircumflex, 0x1ED0, 
 GDK_apostrophe, GDK_Otilde, 0x1E4C, 
 GDK_apostrophe, GDK_Ooblique, 0x01FE, 
-GDK_apostrophe, 0x00DC, 0x01D7, 
+GDK_apostrophe, GDK_Udiaeresis, 0x01D7, 
 GDK_apostrophe, GDK_acircumflex, 0x1EA5, 
 GDK_apostrophe, GDK_aring, 0x01FB, 
 GDK_apostrophe, GDK_ae, 0x01FD, 
@@ -1529,6 +1550,7 @@ GDK_minus, GDK_parenright, 0x007D,
 GDK_minus, GDK_plus, 0x00B1, 
 GDK_minus, GDK_comma, 0x00AC, 
 GDK_minus, GDK_colon, 0x00F7, 
+GDK_minus, GDK_greater, 0x2192, 
 GDK_minus, GDK_A, 0x00C3, 
 GDK_minus, GDK_D, 0x0110, 
 GDK_minus, GDK_E, 0x0112, 
@@ -1603,6 +1625,7 @@ GDK_period, 0x1E62, 0x1E68,
 GDK_period, 0x1E63, 0x1E69, 
 GDK_slash, GDK_slash, 0x005C, 
 GDK_slash, GDK_less, 0x005C, 
+GDK_slash, GDK_equal, 0x2260, 
 GDK_slash, GDK_C, 0x00A2, 
 GDK_slash, GDK_D, 0x0110, 
 GDK_slash, GDK_G, 0x01E4, 
@@ -1682,8 +1705,11 @@ GDK_semicolon, GDK_u, 0x0173,
 GDK_less, GDK_space, 0x02C7, 
 GDK_less, GDK_quotedbl, 0x201C, 
 GDK_less, GDK_apostrophe, 0x2018, 
+GDK_less, GDK_minus, 0x2190, 
 GDK_less, GDK_slash, 0x005C, 
+GDK_less, GDK_3, 0x2665, 
 GDK_less, GDK_less, 0x00AB, 
+GDK_less, GDK_equal, 0x2264, 
 GDK_less, GDK_C, 0x010C, 
 GDK_less, GDK_D, 0x010E, 
 GDK_less, GDK_E, 0x011A, 
@@ -1703,6 +1729,7 @@ GDK_less, GDK_s, 0x0161,
 GDK_less, GDK_t, 0x0165, 
 GDK_less, GDK_z, 0x017E, 
 GDK_less, 0x0338, 0x226E, 
+GDK_equal, GDK_slash, 0x2260, 
 GDK_equal, GDK_C, 0x20AC, 
 GDK_equal, GDK_E, 0x20AC, 
 GDK_equal, GDK_L, 0x00A3, 
@@ -1725,6 +1752,7 @@ GDK_equal, GDK_Cyrillic_U, 0x04F2,
 GDK_greater, GDK_space, 0x005E, 
 GDK_greater, GDK_quotedbl, 0x201D, 
 GDK_greater, GDK_apostrophe, 0x2019, 
+GDK_greater, GDK_equal, 0x2265, 
 GDK_greater, GDK_greater, 0x00BB, 
 GDK_greater, GDK_A, 0x00C2, 
 GDK_greater, GDK_E, 0x00CA, 
@@ -2068,7 +2096,7 @@ GDK_underscore, GDK_Adiaeresis, 0x01DE,
 GDK_underscore, GDK_AE, 0x01E2, 
 GDK_underscore, GDK_Otilde, 0x022C, 
 GDK_underscore, GDK_Odiaeresis, 0x022A, 
-GDK_underscore, 0x00DC, 0x01D5, 
+GDK_underscore, GDK_Udiaeresis, 0x01D5, 
 GDK_underscore, GDK_adiaeresis, 0x01DF, 
 GDK_underscore, GDK_ae, 0x01E3, 
 GDK_underscore, GDK_otilde, 0x022D, 
@@ -2128,7 +2156,7 @@ GDK_grave, GDK_y, 0x1EF3,
 GDK_grave, GDK_Acircumflex, 0x1EA6, 
 GDK_grave, GDK_Ecircumflex, 0x1EC0, 
 GDK_grave, GDK_Ocircumflex, 0x1ED2, 
-GDK_grave, 0x00DC, 0x01DB, 
+GDK_grave, GDK_Udiaeresis, 0x01DB, 
 GDK_grave, GDK_acircumflex, 0x1EA7, 
 GDK_grave, GDK_ecircumflex, 0x1EC1, 
 GDK_grave, GDK_ocircumflex, 0x1ED3, 
@@ -2279,7 +2307,7 @@ GDK_c, GDK_t, 0x0165,
 GDK_c, GDK_u, 0x01D4, 
 GDK_c, GDK_z, 0x017E, 
 GDK_c, GDK_bar, 0x00A2, 
-GDK_c, 0x00DC, 0x01D9, 
+GDK_c, GDK_Udiaeresis, 0x01D9, 
 GDK_c, GDK_udiaeresis, 0x01DA, 
 GDK_c, 0x01B7, 0x01EE, 
 GDK_c, 0x0292, 0x01EF, 
@@ -2517,7 +2545,7 @@ GDK_macron, GDK_Adiaeresis, 0x01DE,
 GDK_macron, GDK_AE, 0x01E2, 
 GDK_macron, GDK_Otilde, 0x022C, 
 GDK_macron, GDK_Odiaeresis, 0x022A, 
-GDK_macron, 0x00DC, 0x01D5, 
+GDK_macron, GDK_Udiaeresis, 0x01D5, 
 GDK_macron, GDK_adiaeresis, 0x01DF, 
 GDK_macron, GDK_ae, 0x01E3, 
 GDK_macron, GDK_otilde, 0x022D, 
@@ -2586,7 +2614,7 @@ GDK_acute, GDK_Idiaeresis, 0x1E2E,
 GDK_acute, GDK_Ocircumflex, 0x1ED0, 
 GDK_acute, GDK_Otilde, 0x1E4C, 
 GDK_acute, GDK_Ooblique, 0x01FE, 
-GDK_acute, 0x00DC, 0x01D7, 
+GDK_acute, GDK_Udiaeresis, 0x01D7, 
 GDK_acute, GDK_acircumflex, 0x1EA5, 
 GDK_acute, GDK_aring, 0x01FB, 
 GDK_acute, GDK_ae, 0x01FD, 
@@ -4320,6 +4348,7 @@ GDK_parenleft, GDK_KP_4, GDK_KP_7, GDK_parenright, 0x32BC,
 GDK_parenleft, GDK_KP_4, GDK_KP_8, GDK_parenright, 0x32BD, 
 GDK_parenleft, GDK_KP_4, GDK_KP_9, GDK_parenright, 0x32BE, 
 GDK_parenleft, GDK_KP_5, GDK_KP_0, GDK_parenright, 0x32BF, 
+GDK_C, GDK_C, GDK_C, GDK_P, 0x262D, 
 GDK_Greek_iota, GDK_apostrophe, GDK_parenleft, GDK_Greek_ALPHA, 0x1F8D, 
 GDK_Greek_iota, GDK_apostrophe, GDK_parenleft, GDK_Greek_ETA, 0x1F9D, 
 GDK_Greek_iota, GDK_apostrophe, GDK_parenleft, GDK_Greek_OMEGA, 0x1FAD,