--- a/src/locale/langinfo.c	
+++ a/src/locale/langinfo.c	
@@ -34,7 +34,7 @@ char *__nl_langinfo_l(nl_item item, locale_t loc)
 	const char *str;
 
 	if (item == CODESET)
-		return MB_CUR_MAX==1 ? "UTF-8-CODE-UNITS" : "UTF-8";
+		return "UTF-8";
 	
 	switch (cat) {
 	case LC_NUMERIC: