--- a/usr/src/cmd/slim-install/config/set_lang	Sat Dec 04 12:22:52 2010 +0000
+++ b/usr/src/cmd/slim-install/config/set_lang	Tue Aug 16 20:54:08 2011 +0000
@@ -125,7 +125,7 @@
 
 	# check whether we have a module for this locale ("C" and "POSIX"
 	# are always supported)
-        if [[ ! -f "/usr/lib/locale/${node.lang}/${node.lang}.so.3" && \
+        if [[ ! -f "/usr/lib/locale/${node.lang}/LC_COLLATE/LCL_DATA" && \
 	      "${node.lang}" != ~(Elr)(POSIX|C) ]] ; then
 		continue
 	fi

--- a/usr/src/lib/liborchestrator/locale.c	Sat Dec 04 12:22:52 2010 +0000
+++ b/usr/src/lib/liborchestrator/locale.c	Tue Aug 16 20:54:08 2011 +0000
@@ -1634,7 +1634,7 @@
 	if (strstr(locale, UTF) == NULL)
 		return (B_FALSE);
 
-	(void) snprintf(path, sizeof (path), "%s/%s/locale_map",
+	(void) snprintf(path, sizeof (path), "%s/%s/LC_COLLATE/LCL_DATA",
 	    NLS_PATH, locale);
 	if ((stat(path, &stat_buf) == 0) &&
 	    ((stat_buf.st_mode & S_IFMT) == S_IFREG)) {