diff -Nuar xc/lib/X11/XKBCvt.c xc.iso8859-11/lib/X11/XKBCvt.c
--- xc/lib/X11/XKBCvt.c	Tue Jul  9 17:18:04 2002
+++ xc.iso8859-11/lib/X11/XKBCvt.c	Tue Jul  9 17:26:43 2002
@@ -255,7 +255,7 @@
  */
 
 #define	CHARSET_FILE	"/usr/lib/X11/input/charsets"
-static char *_XkbKnownLanguages = "c=ascii:da,de,en,es,fr,is,it,nl,no,pt,sv=iso8859-1:hu,pl,cs=iso8859-2:eo=iso8859-3:sp=iso8859-5:ar,ara=iso8859-6:el=iso8859-7:he=iso8859-8:tr=iso8859-9:lt,lv=iso8859-13:et,fi=iso8859-15:ru=koi8-r:uk=koi8-u:th,th_TH,th_TH.TIS620=tis620:hy=armscii-8:vi=tcvn-5712:ka=georgian-academy:be,bg=microsoft-cp1251";
+static char *_XkbKnownLanguages = "c=ascii:da,de,en,es,fr,is,it,nl,no,pt,sv=iso8859-1:hu,pl,cs=iso8859-2:eo=iso8859-3:sp=iso8859-5:ar,ara=iso8859-6:el=iso8859-7:he=iso8859-8:tr=iso8859-9:lt,lv=iso8859-13:et,fi=iso8859-15:ru=koi8-r:uk=koi8-u:th,th_TH,th_TH.iso8859-11=iso8859-11:th_TH.TIS620=tis620:hy=armscii-8:vi=tcvn-5712:ka=georgian-academy:be,bg=microsoft-cp1251";
 
 char	*
 _XkbGetCharset()
diff -Nuar xc/lib/X11/lcCT.c xc.iso8859-11/lib/X11/lcCT.c
--- xc/lib/X11/lcCT.c	Tue Jul  9 17:17:18 2002
+++ xc.iso8859-11/lib/X11/lcCT.c	Tue Jul  9 17:26:43 2002
@@ -72,13 +72,16 @@
     { "ISO8859-8:GR",       /* ISO-8859-8          138   */  "\033-H" },
     { "ISO8859-9:GR",       /* ISO-8859-9          148   */  "\033-M" },
     { "ISO8859-10:GR",      /* ISO-8859-10         157   */  "\033-V" },
+    { "ISO8859-11:GR",      /* ISO-8859-11         166   */  "\033-T" },
     { "ISO8859-13:GR",      /* ISO-8859-13         179   */  "\033-Y" },
     { "ISO8859-14:GR",      /* ISO-8859-14         199   */  "\033-_" },
     { "ISO8859-15:GR",      /* ISO-8859-15         203   */  "\033-b" },
     { "ISO8859-16:GR",      /* ISO-8859-16         226   */  "\033-f" },
     { "JISX0201.1976-0:GL", /* ISO-646-JP           14   */  "\033(J" },
     { "JISX0201.1976-0:GR",                                  "\033)I" },
+#if 0
     { "TIS620-0:GR",        /* TIS-620             166   */  "\033-T" },
+#endif
 
     /* Registered character sets with two byte per character */
     { "GB2312.1980-0:GL",   /* GB_2312-80           58   */ "\033$(A" },
diff -Nuar xc/lib/X11/lcUTF8.c xc.iso8859-11/lib/X11/lcUTF8.c
--- xc/lib/X11/lcUTF8.c	Tue Jul  9 17:17:12 2002
+++ xc.iso8859-11/lib/X11/lcUTF8.c	Tue Jul  9 17:26:43 2002
@@ -183,6 +183,7 @@
 #include "lcUniConv/iso8859_8.h"
 #include "lcUniConv/iso8859_9.h"
 #include "lcUniConv/iso8859_10.h"
+#include "lcUniConv/iso8859_11.h"
 #include "lcUniConv/iso8859_13.h"
 #include "lcUniConv/iso8859_14.h"
 #include "lcUniConv/iso8859_15.h"
@@ -253,6 +254,9 @@
     },
     { "ISO8859-10", NULLQUARK,
 	iso8859_10_mbtowc, iso8859_10_wctomb
+    },
+    { "ISO8859-11", NULLQUARK,
+	iso8859_11_mbtowc, iso8859_11_wctomb
     },
     { "ISO8859-13", NULLQUARK,
 	iso8859_13_mbtowc, iso8859_13_wctomb
diff -Nuar xc/lib/X11/lcUniConv/iso8859_11.h xc.iso8859-11/lib/X11/lcUniConv/iso8859_11.h
--- xc/lib/X11/lcUniConv/iso8859_11.h	Thu Jan  1 07:00:00 1970
+++ xc.iso8859-11/lib/X11/lcUniConv/iso8859_11.h	Tue Jul  9 17:26:43 2002
@@ -0,0 +1,78 @@
+/* $Id: xf-cvs20020709-iso8859_11locale.patch,v 1.1 2002/07/09 12:24:01 thep Exp $ */
+
+/*
+ * ISO8859-11
+ */
+
+static const unsigned short iso8859_11_2uni[96] = {
+  /* 0xa0 */
+  0x00a0, 0x0e01, 0x0e02, 0x0e03, 0x0e04, 0x0e05, 0x0e06, 0x0e07,
+  0x0e08, 0x0e09, 0x0e0a, 0x0e0b, 0x0e0c, 0x0e0d, 0x0e0e, 0x0e0f,
+  /* 0xb0 */
+  0x0e10, 0x0e11, 0x0e12, 0x0e13, 0x0e14, 0x0e15, 0x0e16, 0x0e17,
+  0x0e18, 0x0e19, 0x0e1a, 0x0e1b, 0x0e1c, 0x0e1d, 0x0e1e, 0x0e1f,
+  /* 0xc0 */
+  0x0e20, 0x0e21, 0x0e22, 0x0e23, 0x0e24, 0x0e25, 0x0e26, 0x0e27,
+  0x0e28, 0x0e29, 0x0e2a, 0x0e2b, 0x0e2c, 0x0e2d, 0x0e2e, 0x0e2f,
+  /* 0xd0 */
+  0x0e30, 0x0e31, 0x0e32, 0x0e33, 0x0e34, 0x0e35, 0x0e36, 0x0e37,
+  0x0e38, 0x0e39, 0x0e3a, 0xfffd, 0xfffd, 0xfffd, 0xfffd, 0x0e3f,
+  /* 0xe0 */
+  0x0e40, 0x0e41, 0x0e42, 0x0e43, 0x0e44, 0x0e45, 0x0e46, 0x0e47,
+  0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e4c, 0x0e4d, 0x0e4e, 0x0e4f,
+  /* 0xf0 */
+  0x0e50, 0x0e51, 0x0e52, 0x0e53, 0x0e54, 0x0e55, 0x0e56, 0x0e57,
+  0x0e58, 0x0e59, 0x0e5a, 0x0e5b, 0xfffd, 0xfffd, 0xfffd, 0xfffd,
+};
+
+static int
+iso8859_11_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
+{
+  unsigned char c = *s;
+  if (c < 0x80) {
+    *pwc = (ucs4_t) c;
+    return 1;
+  }
+  else if (c < 0xa0) {
+  }
+  else {
+    unsigned short wc = iso8859_11_2uni[c-0xa0];
+    if (wc != 0xfffd) {
+      *pwc = (ucs4_t) wc;
+      return 1;
+    }
+  }
+  return RET_ILSEQ;
+}
+
+static const unsigned char iso8859_11_page0e[96] = {
+  0x00, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, /* 0x00-0x07 */
+  0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, /* 0x08-0x0f */
+  0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, /* 0x10-0x17 */
+  0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, /* 0x18-0x1f */
+  0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, /* 0x20-0x27 */
+  0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* 0x28-0x2f */
+  0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, /* 0x30-0x37 */
+  0xd8, 0xd9, 0xda, 0x00, 0x00, 0x00, 0x00, 0xdf, /* 0x38-0x3f */
+  0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, /* 0x40-0x47 */
+  0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, /* 0x48-0x4f */
+  0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, /* 0x50-0x57 */
+  0xf8, 0xf9, 0xfa, 0xfb, 0x00, 0x00, 0x00, 0x00, /* 0x58-0x5f */
+};
+
+static int
+iso8859_11_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
+{
+  unsigned char c = 0;
+  if (wc < 0x0080 || wc == 0x00a0) {
+    *r = wc;
+    return 1;
+  }
+  else if (wc >= 0x0e00 && wc < 0x0e60)
+    c = iso8859_11_page0e[wc-0x0e00];
+  if (c != 0) {
+    *r = c;
+    return 1;
+  }
+  return RET_ILSEQ;
+}
diff -Nuar xc/nls/XI18N_OBJS/Imakefile xc.iso8859-11/nls/XI18N_OBJS/Imakefile
--- xc/nls/XI18N_OBJS/Imakefile	Tue Jul  9 17:19:31 2002
+++ xc.iso8859-11/nls/XI18N_OBJS/Imakefile	Tue Jul  9 17:26:43 2002
@@ -38,6 +38,7 @@
 XI18NTarget(iso8859-8)
 XI18NTarget(iso8859-9)
 XI18NTarget(iso8859-10)
+XI18NTarget(iso8859-11)
 XI18NTarget(iso8859-13)
 XI18NTarget(iso8859-14)
 XI18NTarget(iso8859-15)
diff -Nuar xc/nls/XI18N_OBJS/iso8859-11 xc.iso8859-11/nls/XI18N_OBJS/iso8859-11
--- xc/nls/XI18N_OBJS/iso8859-11	Thu Jan  1 07:00:00 1970
+++ xc.iso8859-11/nls/XI18N_OBJS/iso8859-11	Tue Jul  9 17:26:43 2002
@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for iso8859-11 locale
+#
+XLC	common/xlcDef	_XlcDefaultLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
diff -Nuar xc/nls/XLC_LOCALE/Imakefile xc.iso8859-11/nls/XLC_LOCALE/Imakefile
--- xc/nls/XLC_LOCALE/Imakefile	Tue Jul  9 17:19:23 2002
+++ xc.iso8859-11/nls/XLC_LOCALE/Imakefile	Tue Jul  9 17:26:43 2002
@@ -49,6 +49,7 @@
 LTarget(iso8859-8)
 LTarget(iso8859-9)
 LTarget(iso8859-10)
+LTarget(iso8859-11)
 LTarget(iso8859-13)
 LTarget(iso8859-14)
 LTarget(iso8859-15)
diff -Nuar xc/nls/XLC_LOCALE/iso8859-11 xc.iso8859-11/nls/XLC_LOCALE/iso8859-11
--- xc/nls/XLC_LOCALE/iso8859-11	Thu Jan  1 07:00:00 1970
+++ xc.iso8859-11/nls/XLC_LOCALE/iso8859-11	Tue Jul  9 17:26:43 2002
@@ -0,0 +1,74 @@
+XCOMM  $TOG$
+XCOMM  XLocale Database Sample for iso8859-11.
+XCOMM 
+XCOMM  $Id: xf-cvs20020709-iso8859_11locale.patch,v 1.1 2002/07/09 12:24:01 thep Exp $
+
+XCOMM 
+XCOMM 	XLC_FONTSET category
+XCOMM 
+XLC_FONTSET
+XCOMM 	fs0 class 
+fs0	{
+	charset	{
+		name		ISO8859-1:GL
+	}
+	font	{
+		primary		ISO8859-11:GL
+		substitute	ISO8859-1:GL
+		vertical_rotate	all
+	}
+}
+XCOMM 	fs1 class 
+fs1	{
+	charset	{
+		name		ISO8859-11:GR
+	}
+	font	{
+		primary		ISO8859-11:GR
+	}
+}
+END XLC_FONTSET
+
+XCOMM 
+XCOMM 	XLC_XLOCALE category
+XCOMM 
+XLC_XLOCALE
+
+encoding_name		ISO8859-11
+mb_cur_max		1
+state_depend_encoding	False
+#if WCHAR32
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+#else
+wc_encoding_mask	\x00008080
+wc_shift_bits		8
+#endif
+
+#ifndef X_LOCALE
+use_stdc_env		True
+force_convert_to_mb	True
+#endif
+
+XCOMM 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding	ISO8859-11:GL; ISO8859-1:GL
+}
+
+
+XCOMM 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+#if WCHAR32
+	wc_encoding	\x30000000
+#else
+	wc_encoding	\x00008080
+#endif
+	ct_encoding	ISO8859-11:GR
+}
+
+END XLC_XLOCALE
diff -Nuar xc/nls/locale.alias xc.iso8859-11/nls/locale.alias
--- xc/nls/locale.alias	Tue Jul  9 17:19:02 2002
+++ xc.iso8859-11/nls/locale.alias	Tue Jul  9 19:18:51 2002
@@ -592,8 +592,9 @@
 tg:						tg_TJ.KOI8-C
 tg_TJ:						tg_TJ.KOI8-C
 tg_TJ.koi8c:					tg_TJ.KOI8-C
-th:						th_TH.TIS620
-th_TH:						th_TH.TIS620
+th:						th_TH.ISO8859-11
+th_TH:						th_TH.ISO8859-11
+th_TH.ISO-8859-11:				th_TH.ISO8859-11
 th_TH.tis620:					th_TH.TIS620
 th_TH.TIS-620:					th_TH.TIS620
 th_TH.TACTIS:					th_TH.TIS620
@@ -727,7 +728,7 @@
 swedish.iso88591:				sv_SE.ISO8859-1
 turkish:					tr_TR.ISO8859-9
 turkish.iso88599:				tr_TR.ISO8859-9
-thai:						th_TH.tis620
+thai:						th_TH.ISO8859-11
 univ.utf8:					en_US.UTF-8
 XCOMM Digital Unix utf
 universal.utf8@ucs4:				en_US.UTF-8
diff -Nuar xc/nls/locale.dir xc.iso8859-11/nls/locale.dir
--- xc/nls/locale.dir	Tue Jul  9 17:18:58 2002
+++ xc.iso8859-11/nls/locale.dir	Tue Jul  9 17:26:43 2002
@@ -201,6 +201,7 @@
 tscii-0/XLC_LOCALE:			ta_IN.TSCII-0
 koi8-c/XLC_LOCALE:			tg_TJ.KOI8-C
 th_TH/XLC_LOCALE:			th_TH.TIS620
+iso8859-11/XLC_LOCALE:			th_TH.ISO8859-11
 iso8859-1/XLC_LOCALE: 			tl_PH.ISO8859-1
 iso8859-9/XLC_LOCALE:			tr_TR.ISO8859-9
 tatar-cyr/XLC_LOCALE:			tt_RU.TATAR-CYR