diff -rua xc.old/nls/compose.dir xc/nls/compose.dir
--- xc.old/nls/compose.dir	2005-01-11 11:33:41.000000000 +0200
+++ xc/nls/compose.dir	2005-01-12 11:00:27.330703303 +0200
@@ -167,6 +167,8 @@
 iso8859-15/Compose:		nb_NO.ISO8859-15
 iso8859-1/Compose:		nn_NO.ISO8859-1
 iso8859-15/Compose:		nn_NO.ISO8859-15
+iso8859-1/Compose:		nr_ZA.ISO8859-1
+iso8859-15/Compose:		nso_ZA.ISO8859-15
 iso8859-1/Compose:		ny_NO.ISO8859-1
 iso8859-15/Compose:		ny_NO.ISO8859-15
 iso8859-1/Compose:		oc_FR.ISO8859-1
@@ -194,6 +196,8 @@
 iso8859-2/Compose:		sr_SP.ISO8859-2
 iso8859-2/Compose:		sr_YU.ISO8859-2
 iso8859-5/Compose:		sr_YU.ISO8859-5
+iso8859-1/Compose:		ss_ZA.ISO8859-1
+iso8859-1/Compose:		st_ZA.ISO8859-1
 iso8859-1/Compose:		sv_FI.ISO8859-1
 iso8859-15/Compose:		sv_FI.ISO8859-15
 iso8859-1/Compose:		sv_SE.ISO8859-1
@@ -201,7 +205,9 @@
 tscii-0/Compose:		ta_IN.TSCII-0
 koi8-c/Compose:			tg_TJ.KOI8-C
 iso8859-1/Compose:		tl_PH.ISO8859-1
+iso8859-15/Compose:		tn_ZA.ISO8859-15
 iso8859-9/Compose:		tr_TR.ISO8859-9
+iso8859-1/Compose:		ts_ZA.ISO8859-1
 tatar-cyr/Compose:		tt_RU.TATAR-CYR
 koi8-c/Compose:			tt_RU.KOI8-C
 koi8-u/Compose:			uk_UA.KOI8-U
@@ -209,6 +215,7 @@
 vi_VN.viscii/Compose:		vi_VN.VISCII
 vi_VN.tcvn/Compose:		vi_VN.TCVN
 iso8859-1/Compose:		wa_BE.ISO8859-1
+iso8859-1/Compose:		xh_ZA.ISO8859-1
 microsoft-cp1255/Compose:	yi_US.CP1256
 zh_CN/Compose:			zh_CN.eucCN
 zh_CN/Compose:			zh_CN.GB2312
@@ -221,6 +228,7 @@
 zh_TW.big5/Compose:		zh_TW.big5
 zh_TW.big5/Compose:		zh_TW.Big5
 zh_TW/Compose:			zh_TW.eucTW
+iso8859-1/Compose:		zu_ZA.ISO8859-1
 XCOMM
 XCOMM
 en_US.UTF-8/Compose:		af_ZA.UTF-8
@@ -328,6 +336,8 @@
 en_US.UTF-8/Compose:		nl_NL.UTF-8
 en_US.UTF-8/Compose:		no_NO.UTF-8
 en_US.UTF-8/Compose:		nb_NO.UTF-8
+en_US.UTF-8/Compose:		nr_ZA.UTF-8
+en_US.UTF-8/Compose:		nso_ZA.UTF-8
 en_US.UTF-8/Compose:		ny_NO.UTF-8
 en_US.UTF-8/Compose:		oc_FR.UTF-8
 en_US.UTF-8/Compose:		pa_IN.UTF-8
@@ -346,18 +356,25 @@
 en_US.UTF-8/Compose:		sl_SI.UTF-8
 en_US.UTF-8/Compose:		sq_AL.UTF-8
 en_US.UTF-8/Compose:		sr_YU.UTF-8
+en_US.UTF-8/Compose:		ss_ZA.UTF-8
+en_US.UTF-8/Compose:		st_ZA.UTF-8
 en_US.UTF-8/Compose:		sv_FI.UTF-8
 en_US.UTF-8/Compose:		sv_SE.UTF-8
 en_US.UTF-8/Compose:		ta_IN.UTF-8
 en_US.UTF-8/Compose:		tg_TJ.UTF-8
 en_US.UTF-8/Compose:		th_TH.UTF-8
 en_US.UTF-8/Compose:		tl_PH.UTF-8
+en_US.UTF-8/Compose:		tn_ZA.UTF-8
 en_US.UTF-8/Compose:		tr_TR.UTF-8
+en_US.UTF-8/Compose:		ts_ZA.UTF-8
 en_US.UTF-8/Compose:		tt_RU.UTF-8
 en_US.UTF-8/Compose:		uk_UA.UTF-8
 en_US.UTF-8/Compose:		ur_PK.UTF-8
 en_US.UTF-8/Compose:		uz_UZ.UTF-8
+en_US.UTF-8/Compose:		ve_ZA.UTF-8
 en_US.UTF-8/Compose:		vi_VN.UTF-8
 en_US.UTF-8/Compose:		wa_BE.UTF-8
+en_US.UTF-8/Compose:		xh_ZA.UTF-8
 en_US.UTF-8/Compose:		yi_US.UTF-8
 en_US.UTF-8/Compose:		zh_TW.UTF-8
+en_US.UTF-8/Compose:		zu_ZA.UTF-8
diff -rua xc.old/nls/locale.alias xc/nls/locale.alias
--- xc.old/nls/locale.alias	2005-01-11 11:33:53.000000000 +0200
+++ old/nls/locale.alias	2005-01-12 10:47:40.640376673 +0200
@@ -20,6 +20,7 @@
 af:						af_ZA.ISO8859-1
 af_ZA:						af_ZA.ISO8859-1
 af_ZA.iso88591:					af_ZA.ISO8859-1
+af_ZA.utf8:					af_ZA.UTF-8
 am:						am_ET.UTF-8
 ar:						ar_AA.ISO8859-6
 ar_AA:						ar_AA.ISO8859-6
@@ -630,6 +631,14 @@
 no_NO.ISO-8859-1:				no_NO.ISO8859-1
 no_NO.iso885915:				no_NO.ISO8859-15
 no_NO.utf8:					no_NO.UTF-8
+nr:							nr_ZA.ISO8859-1
+nr_ZA:						nr_ZA.ISO8859-1
+nr_ZA.iso88591:				nr_ZA.ISO8859-1
+nr_ZA.utf8:					nr_ZA.UTF-8
+nso:						nso_ZA.ISO8859-15
+nso_ZA:						nso_ZA.ISO8859-15
+nso_ZA.iso885915:			nso_ZA.ISO8859-15
+nso_ZA.utf8:				nso_ZA.UTF-8
 ny:						ny_NO.ISO8859-1
 ny_NO:						ny_NO.ISO8859-1
 ny_NO.88591:					ny_NO.ISO8859-1
@@ -748,6 +757,14 @@
 sr_YU.MICROSOFT-CP1251@cyrillic:		sr_YU.CP1251
 sr_YU.utf8:					sr_YU.UTF-8
 sr_YU.UTF-8@cyrillic:				sr_YU.UTF-8
+ss:							ss_ZA.ISO8859-1
+ss_ZA:						ss_ZA.ISO8859-1
+ss_ZA.iso88591:				ss_ZA.ISO8859-1
+ss_ZA.utf8:					ss_ZA.UTF-8
+st:							st_ZA.ISO8859-1
+st_ZA:						st_ZA.ISO8859-1
+st_ZA.iso88591:				st_ZA.ISO8859-1
+st_ZA.utf8:					st_ZA.UTF-8
 sv:						sv_SE.ISO8859-1
 sv_FI:						sv_FI.ISO8859-1
 sv_FI.iso88591:					sv_FI.ISO8859-1
@@ -780,6 +797,10 @@
 tl:						tl_PH.ISO8859-1
 tl_PH:						tl_PH.ISO8859-1
 tl_PH.iso88591:					tl_PH.ISO8859-1
+tn:							tn_ZA.ISO8859-15
+tn_ZA:						tn_ZA.ISO8859-15
+tn_ZA.iso885915				tn_ZA.ISO8859-15
+tn_ZA.utf8:					tn_ZA.UTF-8
 tr:						tr_TR.ISO8859-9
 tr_TR:						tr_TR.ISO8859-9
 TR_TR:						tr_TR.ISO8859-9
@@ -787,6 +808,10 @@
 tr_TR.ISO-8859-9:				tr_TR.ISO8859-9
 tr_TR.utf8:					tr_TR.UTF-8
 TR_TR.utf8:					tr_TR.UTF-8
+ts:							ts_ZA.ISO8859-1
+ts_ZA:						ts_ZA.ISO8859-1
+ts_ZA.iso88591:				ts_ZA.ISO8859-1
+ts_ZA.utf8:					ts_ZA.UTF-8
 tt:						tt_RU.TATAR-CYR
 tt_RU:						tt_RU.TATAR-CYR
 tt_RU.tatarcyr:					tt_RU.TATAR-CYR
@@ -808,6 +833,9 @@
 ur_PK.MICROSOFT-CP1256:				ur_PK.CP1256
 uz:						uz_UZ.UTF-8
 uz_UZ:						uz_UZ.UTF-8
+ve:							ve_ZA.UTF-8
+ve_ZA:						ve_ZA.UTF-8
+ve_ZA.utf8:					ve_ZA.UTF-8
 vi:						vi_VN.TCVN
 vi_VN:						vi_VN.TCVN
 Vi_VN:						vi_VN.TCVN
@@ -823,6 +851,10 @@
 wa_BE.iso88591:					wa_BE.ISO8859-1
 wa_BE.iso885915:				wa_BE.ISO8859-15
 wa_BE@euro:					wa_BE.ISO8859-15
+xh:							xh_ZA.ISO8859-1
+xh_ZA:						xh_ZA.ISO8859-1
+xh_ZA.iso88591:				xh_ZA.ISO8859-1
+xh_ZA.utf8:					xh_ZA.UTF-8
 yi:						yi_US.CP1255
 yi_US:						yi_US.CP1255
 yi_US.cp1255:					yi_US.CP1255
@@ -856,6 +888,10 @@
 zh_TW.EUC:					zh_TW.eucTW
 zh_TW.utf8:					zh_TW.UTF-8
 ZH_TW.UTF-8:					zh_TW.UTF-8
+zu:							zu_ZA.ISO8859-1
+zu_ZA:						zu_ZA.ISO8859-1
+zu_ZA.iso88591:				zu_ZA.ISO8859-1
+zu_ZA.utf8:					zu_ZA.UTF-8
 
 XCOMM The following locale names are used in SCO 3.0
 english_uk.8859:				en_GB.ISO8859-1
diff -rua xc.old/nls/locale.dir xc/nls/locale.dir
--- xc.old/nls/locale.dir	2005-01-11 11:33:59.000000000 +0200
+++ xc/nls/locale.dir	2005-01-12 10:55:05.310375699 +0200
@@ -179,6 +179,8 @@
 iso8859-1/XLC_LOCALE:			nn_NO.ISO8859-15
 iso8859-1/XLC_LOCALE:			no_NO.ISO8859-1
 iso8859-1/XLC_LOCALE:			no_NO.ISO8859-15
+iso8859-1/XLC_LOCALE:			nr_ZA.ISO8859-1
+iso8859-15/XLC_LOCALE:			nso_ZA.ISO8859-15
 iso8859-1/XLC_LOCALE:			ny_NO.ISO8859-1
 iso8859-1/XLC_LOCALE:			ny_NO.ISO8859-15
 iso8859-1/XLC_LOCALE:			oc_FR.ISO8859-1
@@ -204,6 +206,8 @@
 iso8859-2/XLC_LOCALE:			sr_YU.ISO8859-2
 iso8859-5/XLC_LOCALE:			sr_YU.ISO8859-5
 microsoft-cp1251/XLC_LOCALE:		sr_YU.CP1251
+iso8859-1/XLC_LOCALE:			ss_ZA.ISO8859-1
+iso8859-1/XLC_LOCALE:			st_ZA.ISO8859-1
 iso8859-1/XLC_LOCALE:			sv_FI.ISO8859-1
 iso8859-15/XLC_LOCALE:			sv_FI.ISO8859-15
 iso8859-1/XLC_LOCALE:			sv_SE.ISO8859-1
@@ -213,7 +217,9 @@
 th_TH/XLC_LOCALE:			th_TH.TIS620
 iso8859-11/XLC_LOCALE:			th_TH.ISO8859-11
 iso8859-1/XLC_LOCALE: 			tl_PH.ISO8859-1
+iso8859-15/XLC_LOCALE:			tn_ZA.ISO8859-15
 iso8859-9/XLC_LOCALE:			tr_TR.ISO8859-9
+iso8859-1/XLC_LOCALE:			ts_ZA.ISO8859-1
 tatar-cyr/XLC_LOCALE:			tt_RU.TATAR-CYR
 koi8-c/XLC_LOCALE:			tt_RU.KOI8-C
 iso8859-5/XLC_LOCALE: 			uk_UA.ISO8859-5
@@ -224,6 +230,7 @@
 vi_VN.viscii/XLC_LOCALE:		vi_VN.VISCII
 iso8859-1/XLC_LOCALE:			wa_BE.ISO8859-1
 iso8859-15/XLC_LOCALE:			wa_BE.ISO8859-15
+iso8859-1/XLC_LOCALE:			xh_ZA.ISO8859-1
 microsoft-cp1255/XLC_LOCALE:		yi_US.CP1255
 zh_CN/XLC_LOCALE:			zh_CN.eucCN
 zh_CN/XLC_LOCALE:			zh_CN.gb2312
@@ -236,6 +243,7 @@
 zh_HK.big5hkscs/XLC_LOCALE:		zh_HK.Big5HKSCS
 zh_TW.big5/XLC_LOCALE:			zh_TW.big5
 zh_TW/XLC_LOCALE:			zh_TW.eucTW
+iso8859-1/XLC_LOCALE:			zu_ZA.ISO8859-1
 XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
 en_US.UTF-8/XLC_LOCALE:			af_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			am_ET.UTF-8
@@ -351,6 +359,8 @@
 en_US.UTF-8/XLC_LOCALE:			nb_NO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			nn_NO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			no_NO.UTF-8
+en_US.UTF-8/XLC_LOCALE:			nr_ZA.UTF-8
+en_US.UTF-8/XLC_LOCALE:			nso_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ny_NO.UTF-8
 en_US.UTF-8/XLC_LOCALE:			oc_FR.UTF-8
 en_US.UTF-8/XLC_LOCALE:			pa_IN.UTF-8
@@ -371,6 +381,8 @@
 en_US.UTF-8/XLC_LOCALE:			sl_SI.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sq_AL.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sr_YU.UTF-8
+en_US.UTF-8/XLC_LOCALE:			ss_ZA.UTF-8
+en_US.UTF-8/XLC_LOCALE:			st_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sv_FI.UTF-8
 en_US.UTF-8/XLC_LOCALE:			sv_SE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ta_IN.UTF-8
@@ -379,18 +391,23 @@
 en_US.UTF-8/XLC_LOCALE:			ti_ER.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ti_ET.UTF-8
 en_US.UTF-8/XLC_LOCALE:			tl_PH.UTF-8
+en_US.UTF-8/XLC_LOCALE:			tn_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			tr_TR.UTF-8
+en_US.UTF-8/XLC_LOCALE:			ts_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			tt_RU.UTF-8
 en_US.UTF-8/XLC_LOCALE:			uk_UA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ur_PK.UTF-8
 en_US.UTF-8/XLC_LOCALE:			uz_UZ.UTF-8
+en_US.UTF-8/XLC_LOCALE:			ve_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			vi_VN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			wa_BE.UTF-8
+en_US.UTF-8/XLC_LOCALE:			xh_ZA.UTF-8
 en_US.UTF-8/XLC_LOCALE:			yi_US.UTF-8
 zh_CN.UTF-8/XLC_LOCALE:			zh_CN.UTF-8
 zh_HK.UTF-8/XLC_LOCALE:			zh_HK.UTF-8
 zh_CN.UTF-8/XLC_LOCALE:			zh_SG.UTF-8
 zh_TW.UTF-8/XLC_LOCALE:			zh_TW.UTF-8
+en_US.UTF-8/XLC_LOCALE:			zu_ZA.UTF-8
 #ifdef __uxp__
 ja.U90/XLC_LOCALE:			ja_JP.U90
 ja.S90/XLC_LOCALE:			ja_JP.S90
diff -rua xc.old/programs/Xserver/XpConfig/Imakefile xc/programs/Xserver/XpConfig/Imakefile
--- xc.old/programs/Xserver/XpConfig/Imakefile	2005-01-11 11:27:53.000000000 +0200
+++ xc/programs/Xserver/XpConfig/Imakefile	2005-01-12 11:38:02.203669388 +0200
@@ -19,8 +19,11 @@
 # List of locales which should be linked to the "C" locale
 C_LOCALES= \
 	POSIX \
+        af \
         af_ZA \
         af_ZA.iso88591 \
+        af_ZA.utf8 \
+        afrikaans \
         ar \
         ar_AE \
         ar_AE.iso88596 \
@@ -458,6 +461,16 @@
         no_NO.iso88591 \
         no_NO.utf8 \
         norwegian \
+        nr \
+        nr_ZA \
+        nr_ZA.iso88591 \
+        nr_ZA.utf8 \
+        ndebele \
+        nso \
+        nso_ZA \
+        nso_ZA.iso885915 \
+        nso_ZA.utf8 \
+        sepedi \
         oc_FR \
         oc_FR.iso88591 \
         pa_IN.UTF-8 \
@@ -546,6 +559,16 @@
         sr_YU.iso88595@cyrillic \
         sr_YU.utf8 \
         sr_YU@cyrillic \
+        ss \
+        ss_ZA \
+        ss_ZA.iso88591 \
+        ss_ZA.utf8 \
+        siswati \
+        st \
+        st_ZA \
+        st_ZA.iso88591 \
+        st_ZA.utf8 \
+        sesotho \
         sv \
         sv.ISO8859-1 \
         sv.ISO8859-15 \
@@ -579,6 +602,11 @@
         th_TH.utf8 \
         tl_PH \
         tl_PH.iso88591 \
+        tn \
+        tn_ZA \
+        tn_ZA.iso885915 \
+        tn_ZA.utf8 \
+        setswana \
         tr \
         tr.ISO8859-9 \
         turkish \
@@ -587,6 +615,11 @@
         tr_TR.UTF-8 \
         tr_TR.iso88599 \
         tr_TR.utf8 \
+        ts \
+        ts_ZA \
+        ts_ZA.iso88591 \
+        ts_ZA.utf8 \
+        tsonga \
         uk_UA \
         uk_UA.koi8u \
         uk_UA.utf8 \
@@ -594,6 +627,10 @@
         ur_PK.utf8 \
         uz_UZ \
         uz_UZ.iso88591 \
+        ve \
+        ve_ZA \
+        ve_ZA.utf8 \
+        venda
         vi_VN \
         vi_VN.tcvn \
         vi_VN.utf8 \
@@ -601,6 +638,11 @@
         wa_BE.iso88591 \
         wa_BE.iso885915@euro \
         wa_BE@euro \
+        xh \
+        xh_ZA \
+        xh_ZA.iso88591 \
+        xh_ZA.utf8 \
+        xhosa \
         zh \
         zh.GBK \
         zh.UTF-8 \
@@ -652,7 +694,12 @@
         zh_TW.UTF-8@zhuyin \
         zh_TW.big5 \
         zh_TW.euctw \
-        zh_TW.utf8
+        zh_TW.utf8 \
+        zu \
+        zu_ZA \
+        zu_ZA.iso88591 \
+        zu_ZA.utf8 \
+        zulu
 
 
 # List of locales which should be linked to the "en_US" locale,