Index: FreeWnn-1.1.1-a023/Wnn/etc/msg.c
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/etc/msg.c
+++ FreeWnn-1.1.1-a023/Wnn/etc/msg.c
@@ -412,12 +412,12 @@ main ()
 {
   struct msg_cat *cd;
 
-  cd = msg_open ("msg", "%L", "ja_JP");
+  cd = msg_open ("msg", "%L", "ja");
 
-  printf (msg_get (cd, 5, "message not found\n", "ja_JP"), 555);
+  printf (msg_get (cd, 5, "message not found\n", "ja"), 555);
   printf (msg_get (cd, 6, "message not found\n", "zh_CN"));
   printf (msg_get (cd, -1, "", "ja_JP"), 555);
-  printf (msg_get (cd, 2, "message not found\n", "ja_JP"), "abc");
+  printf (msg_get (cd, 2, "message not found\n", "ja"), "abc");
   printf (msg_get (cd, 100, "message not found\n", "zh_CN"), "abc");
 }
 #endif /* not_use */
Index: FreeWnn-1.1.1-a023/Wnn/include/jd_sock.h
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/include/jd_sock.h
+++ FreeWnn-1.1.1-a023/Wnn/include/jd_sock.h
@@ -57,7 +57,7 @@
 #ifdef  JAPANESE                /* Japanese */
 # define WNN_PORT_IN    (0x5701)
 static char *sockname = "/tmp/jd_sockV4";       /* for jserver */
-# define LANG_NAME      "ja_JP"
+# define LANG_NAME      "ja"
 # define SERVERNAME     "wnn4"
 # define MESSAGE_FILE   "jserver.msg"
 #else /* JAPANESE */
@@ -88,7 +88,7 @@ static char *sockname = "/tmp/kd_sockV4"
 
 # define WNN_PORT_IN    (0x5701)
 static char *sockname = "/tmp/jd_sockV4";       /* for jserver */
-# define LANG_NAME      "ja_JP"
+# define LANG_NAME      "ja"
 # define SERVERNAME     "wnn4"
 # define MESSAGE_FILE   "jserver.msg"
 #endif /* KOREAN */
Index: FreeWnn-1.1.1-a023/Wnn/include/jslib.h
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/include/jslib.h
+++ FreeWnn-1.1.1-a023/Wnn/include/jslib.h
@@ -412,8 +412,8 @@ struct wnn_file_head
 /*
   JSLIB function declaration
 */
-#define js_open(server, timeout)        js_open_lang(server, "ja_JP", timeout)
-#define js_connect(server,env_name)     js_connect_lang(server, env_name, "ja_JP")
+#define js_open(server, timeout)        js_open_lang(server, "ja", timeout)
+#define js_connect(server,env_name)     js_connect_lang(server, env_name, "ja")
 
 
 extern WNN_JSERVER_ID *js_open_lang FRWNN_PARAMS((const register char *server, const register char *lang, register int timeout));
Index: FreeWnn-1.1.1-a023/Wnn/include/msg.h
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/include/msg.h
+++ FreeWnn-1.1.1-a023/Wnn/include/msg.h
@@ -62,7 +62,7 @@ struct msg_cat
 /*
 #define DEF_LANG "C"
 */
-#define DEF_LANG "ja_JP"
+#define DEF_LANG "ja"
 
 #if __STDC__
 #define FRWNN_PARAMS(paramlist)	paramlist
Index: FreeWnn-1.1.1-a023/Wnn/include/wnn_config.h
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/include/wnn_config.h
+++ FreeWnn-1.1.1-a023/Wnn/include/wnn_config.h
@@ -44,7 +44,7 @@
 #define WNN_CSERVER_ENV         "CSERVER"
 #define WNN_KSERVER_ENV         "KSERVER"
 #define WNN_TSERVER_ENV         "TSERVER"
-#define WNN_J_LANG              "ja_JP"
+#define WNN_J_LANG              "ja"
 #define WNN_C_LANG              "zh_CN"
 #define WNN_K_LANG              "ko_KR"
 #define WNN_T_LANG              "zh_TW"
@@ -79,7 +79,7 @@
 /* for jserver */
 #ifndef SERVER_INIT_FILE
 # ifdef JAPANESE
-#  define SERVER_INIT_FILE      "/ja_JP/jserverrc"
+#  define SERVER_INIT_FILE      "/ja/jserverrc"
 # else /* JAPANESE */
 # ifdef CHINESE
 # ifdef TAIWANESE
@@ -91,7 +91,7 @@
 # ifdef KOREAN
 #  define SERVER_INIT_FILE      "/ko_KR/kserverrc"
 # else /* KOREAN */
-#  define SERVER_INIT_FILE      "/ja_JP/jserverrc"      /* Default */
+#  define SERVER_INIT_FILE      "/ja/jserverrc"      /* Default */
 # endif /* KOREAN */
 # endif /* CHINESE */
 # endif /* JAPANESE */
@@ -109,7 +109,7 @@
 
 #define ENVRCFILE               "/wnnenvrc"
 #ifndef HINSIDATA_FILE
-# define HINSIDATA_FILE         "/ja_JP/hinsi.data"
+# define HINSIDATA_FILE         "/ja/hinsi.data"
 #endif /* HINSIDATA_FILE */
 
 #define USR_DIC_DIR_VAR "@USR"
Index: FreeWnn-1.1.1-a023/Wnn/jd/serverdefs
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/jd/serverdefs
+++ FreeWnn-1.1.1-a023/Wnn/jd/serverdefs
@@ -30,7 +30,7 @@
 ;
 
 ;lang_name	machine_name	unix_domain_socket_name	service_name	port_num
-ja_JP		jserver		/tmp/jd_sockV4		wnn4		22273
+ja		jserver		/tmp/jd_sockV4		wnn4		22273
 japanese	jserver		/tmp/jd_sockV4		wnn4		22273
 nihongo		jserver		/tmp/jd_sockV4		wnn4		22273
 zh_CN		cserver		/tmp/cd_sockV4		wnn4_Cn		22289
Index: FreeWnn-1.1.1-a023/Wnn/jlib/jl.c
===================================================================
--- FreeWnn-1.1.1-a023.orig/Wnn/jlib/jl.c
+++ FreeWnn-1.1.1-a023/Wnn/jlib/jl.c
@@ -460,7 +460,7 @@ jl_connect_lang (env_n, server_n, lang,
   if (!lang || !*lang)
     {
 /* Sorry! Default is Japanese. :-) */
-      strcpy (p_lang, "ja_JP");
+      strcpy (p_lang, "ja");
     }
   else
     {