diff --git a/doc/latin-1.man b/doc/latin-1.man
index 1ed9b83d..67ef7f27 100644
--- a/doc/latin-1.man
+++ b/doc/latin-1.man
@@ -35,16 +35,16 @@ followed by the spacebar.
 | AD | 173 | ­ | SOFT HYPHEN			 | -   --		     |
 | AE | 174 | ® | REGISTERED SIGN		 | RO  ro  OR		     |
 | AF | 175 | ¯ | MACRON				 | -^  _^  __		     |
-| B0 | 176 | ° | DEGREE SIGN			 | o   0^  0*  de  DE	     |
+| B0 | 176 | ° | DEGREE SIGN			 | o   0^  0*  de  DE  ^0    |
 | B1 | 177 | ± | PLUS-MINUS SIGN		 | -+  +-		     |
-| B2 | 178 | ² | SUPERSCRIPT TWO		 | 2   2^  s2		     |
-| B3 | 179 | ³ | SUPERSCRIPT THREE		 | 3   3^  s3		     |
+| B2 | 178 | ² | SUPERSCRIPT TWO		 | 2   2^  s2  ^2	     |
+| B3 | 179 | ³ | SUPERSCRIPT THREE		 | 3   3^  s3  ^3	     |
 | B4 | 180 | ´ | ACUTE ACCENT			 | '   ''		     |
 | B5 | 181 | µ | MICRO SIGN			 | u   /u  /U  *m  *M	     |
 | B6 | 182 | ¶ | PILCROW SIGN			 | p!  P!  pg  PG	     |
 | B7 | 183 | · | MIDDLE DOT			 | .   .^  ..		     |
 | B8 | 184 | ¸ | CEDILLA			 | ,   ,,		     |
-| B9 | 185 | ¹ | SUPERSCRIPT ONE		 | 1   1^  s1		     |
+| B9 | 185 | ¹ | SUPERSCRIPT ONE		 | 1   1^  s1  ^1	     |
 | BA | 186 | º | MASCULINE ORDINAL INDICATOR	 | o_  s0  S0		     |
 | BB | 187 | » | RIGHT DOUBLE ANGLE QUOTES	 | >>			     |
 | BC | 188 | ¼ | VULGAR FRACTION ONE QUARTER	 | 14			     |
diff --git a/x11/x11.c b/x11/x11.c
index 90723068..ba4b3932 100644
--- a/x11/x11.c
+++ b/x11/x11.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-RCSID("$Id: x11.c,v 1.60 2006/12/09 20:44:07 wmcbrine Exp $");
+RCSID("$Id: x11.c,v 1.61 2006/12/09 21:04:24 wmcbrine Exp $");
 
 #ifndef XPOINTER_TYPEDEFED
 typedef char * XPointer;
@@ -230,7 +230,7 @@ static const char *compose_chars =
    ` :  À  È  Ì  Ò  Ù  à  è  ì  ò  ù
    ' :  ´  Á  É  Í  Ó  Ú  Ý  á  é  í  ó  ú  ý  ´
    ~ :  Ã  Ñ  Õ  ã  ñ  õ
-   ^ :  Â  Ê  Î  Ô  Û  â  ê  î  ô  û
+   ^ :  Â  Ê  Î  Ô  Û  â  ê  î  ô  û  °  ¹  ²  ³
    , :  ¸  Ç  ç  ¸
    / :  Ø  ø  µ  µ
    " :  ¨  Ä  Ë  Ï  Ö  Ü  ä  ë  ï  ö  ü  ÿ  ¨
@@ -293,7 +293,7 @@ static const char compose_lookups[MAX_COMPOSE_PRE][MAX_COMPOSE_CHARS] =
 /* ` */ {'A','E','I','O','U','a','e','i','o','u',  0,  0,  0,  0},
 /* ' */ {' ','A','E','I','O','U','Y','a','e','i','o','u','y', 39},
 /* ~ */ {'A','N','O','a','n','o',  0,  0,  0,  0,  0,  0,  0,  0},
-/* ^ */ {'A','E','I','O','U','a','e','i','o','u',  0,  0,  0,  0},
+/* ^ */ {'A','E','I','O','U','a','e','i','o','u','0','1','2','3'},
 /* , */ {' ','C','c',',',  0,  0,  0,  0,  0,  0,  0,  0,  0,  0},
 /* / */ {'O','o','u','U',  0,  0,  0,  0,  0,  0,  0,  0,  0,  0},
 /* " */ {' ','A','E','I','O','U','a','e','i','o','u','y','\"', 0},
@@ -356,7 +356,7 @@ static const unsigned char compose_keys[MAX_COMPOSE_PRE][MAX_COMPOSE_CHARS] =
 /* ` */ {192,200,204,210,217,224,232,236,242,249,  0,  0,  0,  0},
 /* ' */ {180,193,201,205,211,218,221,225,233,237,243,250,253,180},
 /* ~ */ {195,209,213,227,241,245,  0,  0,  0,  0,  0,  0,  0,  0},
-/* ^ */ {194,202,206,212,219,226,234,238,244,251,  0,  0,  0,  0},
+/* ^ */ {194,202,206,212,219,226,234,238,244,251,176,185,178,179},
 /* , */ {184,199,231,184,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0},
 /* / */ {216,248,181,181,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0},
 /* " */ {168,196,203,207,214,220,228,235,239,246,252,255,168,  0},