diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index 93cb2201..d5ab30ef 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -4,7 +4,7 @@ XCOMM	This file contains compose table file name.
 XCOMM	The first word is the compose table file name and
 XCOMM	the second word is full locale name.
 XCOMM
-XCOMM $XFree86: xc/nls/compose.dir,v 1.24 2003/08/06 14:04:00 eich Exp $
+XCOMM $XFree86: xc/nls/compose.dir,v 1.25 2004/02/09 01:35:16 dawes Exp $
 XCOMM
 iso8859-1/Compose:		C
 iso8859-1/Compose:		af_ZA.ISO8859-1
@@ -345,6 +345,7 @@ en_US.UTF-8/Compose:		tr_TR.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:		vi_VN.UTF-8
 en_US.UTF-8/Compose:		wa_BE.UTF-8
 en_US.UTF-8/Compose:		yi_US.UTF-8
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index 848a632b..6c2b4dc7 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -5,7 +5,7 @@ XCOMM	Each alias name is described within one line.
 XCOMM	The first word is the alias name (simplified locale name)
 XCOMM	the second word is full locale name.
 XCOMM
-XCOMM	$XFree86: xc/nls/locale.alias,v 1.65 2004/01/03 03:31:00 dawes Exp $
+XCOMM	$XFree86: xc/nls/locale.alias,v 1.66 2004/02/09 01:35:17 dawes Exp $
 XCOMM
 
 POSIX:						C
@@ -660,6 +660,8 @@ ur_PK.cp1256:					ur_PK.CP1256
 ur_PK.microsoftcp1256:				ur_PK.CP1256
 ur_PK.microsoft-cp1256:				ur_PK.CP1256
 ur_PK.MICROSOFT-CP1256:				ur_PK.CP1256
+uz:						uz_UZ.UTF-8
+uz_UZ:						uz_UZ.UTF-8
 vi:						vi_VN.TCVN
 vi_VN:						vi_VN.TCVN
 vi_VN.tcvn:					vi_VN.TCVN
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index 40ad48d5..7f072cda 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -4,7 +4,7 @@ XCOMM	This file contains locale database file names
 XCOMM	The first word is the locale database file name and
 XCOMM	the second word is the full locale name.
 XCOMM
-XCOMM	$XFree86: xc/nls/locale.dir,v 1.44 2003/12/18 04:14:22 dawes Exp $
+XCOMM	$XFree86: xc/nls/locale.dir,v 1.45 2004/02/09 01:35:18 dawes Exp $
 XCOMM
 
 C/XLC_LOCALE:				C
@@ -365,6 +365,7 @@ en_US.UTF-8/XLC_LOCALE:			tr_TR.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:			vi_VN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			wa_BE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			yi_US.UTF-8
diff --git a/src/SetLocale.c b/src/SetLocale.c
index 07996df6..32fe7c28 100644
--- a/src/SetLocale.c
+++ b/src/SetLocale.c
@@ -55,7 +55,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/SetLocale.c,v 3.20 2003/11/17 22:20:08 dawes Exp $ */
+/* $XFree86: xc/lib/X11/SetLocale.c,v 3.21 2004/02/11 00:30:44 torrey Exp $ */
 
 #include "Xlibint.h"
 #include "Xlcint.h"
@@ -117,6 +117,17 @@ _Xsetlocale(
 
 #else /* X_LOCALE */
 
+#ifdef __DARWIN__
+char *
+_Xsetlocale(
+    int           category,
+    _Xconst char  *name
+)
+{
+    return setlocale(category, name);
+}
+#endif /* __DARWIN__ */
+
 /*
  * _XlcMapOSLocaleName is an implementation dependent routine that derives
  * the LC_CTYPE locale name as used in the sample implementation from that
diff --git a/src/xlibi18n/XlcPubI.h b/src/xlibi18n/XlcPubI.h
index 64504eaf..86a1792f 100644
--- a/src/xlibi18n/XlcPubI.h
+++ b/src/xlibi18n/XlcPubI.h
@@ -23,7 +23,7 @@
  * Author: Katsuhisa Yano	TOSHIBA Corp.
  *			   	mopi@osa.ilab.toshiba.co.jp
  */
-/* $XFree86: xc/lib/X11/XlcPubI.h,v 3.14 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/XlcPubI.h,v 3.15 2004/02/11 00:30:44 torrey Exp $ */
 
 #ifndef _XLCPUBLICI_H_
 #define _XLCPUBLICI_H_
@@ -234,6 +234,12 @@ _Xsetlocale(
     int           category,
     _Xconst char  *name);
 #else
+#ifdef __DARWIN__
+extern char *
+_Xsetlocale(
+    int           category,
+    _Xconst char  *name);
+#endif
 extern char *_XlcMapOSLocaleName(
     char *osname,
     char *siname);