Index: lib/libkiconv/xlat16_iconv.c
===================================================================
RCS file: /home/ncvs/src/lib/libkiconv/xlat16_iconv.c,v
retrieving revision 1.3
diff -u -r1.3 xlat16_iconv.c
--- lib/libkiconv/xlat16_iconv.c	14 Mar 2004 05:14:00 -0000	1.3
+++ lib/libkiconv/xlat16_iconv.c	7 Aug 2005 15:00:16 -0000
@@ -74,6 +74,18 @@
 	struct xlat16_table xt;
 	void *data;
 	char *p;
+	const char unicode[] = ENCODING_UNICODE;
+
+	if ((flag & KICONV_WCTYPE) == 0 &&
+	    strcmp(unicode, tocode) != 0 &&
+	    strcmp(unicode, fromcode) != 0 &&
+	    kiconv_lookupconv(unicode) == 0) {
+		error = kiconv_add_xlat16_cspair(unicode, fromcode, flag);
+		if (error)
+			return (-1);
+		error = kiconv_add_xlat16_cspair(tocode, unicode, flag);
+		return (error);
+	}
 
 	if (kiconv_lookupcs(tocode, fromcode) == 0)
 		return (0);