Index: language.c
===================================================================
--- language.c	(revision 5743)
+++ language.c	(working copy)
@@ -560,6 +560,23 @@
 	encoding = (cups_encoding_t)i;
 	break;
       }
+
+    if (encoding == CUPS_AUTO_ENCODING)
+    {
+     /*
+      * Map alternate names for various character sets...
+      */
+
+      if (!strcasecmp(charset, "iso-2022-jp") ||
+          !strcasecmp(charset, "sjis"))
+	encoding = CUPS_WINDOWS_932;
+      else if (!strcasecmp(charset, "iso-2022-cn"))
+	encoding = CUPS_WINDOWS_936;
+      else if (!strcasecmp(charset, "iso-2022-kr"))
+	encoding = CUPS_WINDOWS_949;
+      else if (!strcasecmp(charset, "big5"))
+	encoding = CUPS_WINDOWS_950;
+    }
   }
 
   DEBUG_printf(("cupsLangGet: encoding=%d(%s)\n", encoding,