diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 43b951dc2..47f92b04f 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -7,6 +7,11 @@ bill@newbreedsoftware.com
 http://www.newbreedsoftware.com/tuxpaint/
 
 
+2003.February.26 (0.9.11)
+  * Set $OUTPUT_CHARSET for Japanese locale, to fix Win32 issue.
+    TOYAMA Shin-ichi <kyone@tky2.3web.ne.jp>
+
+
 2003.February.22 (0.9.10)
   * UTF-8 stamp descriptions word-wrap around spaces.
 
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 3c0bb6d79..c8f4d038a 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -7,12 +7,12 @@
   bill@newbreedsoftware.com
   http://www.newbreedsoftware.com/tuxpaint/
   
-  June 14, 2002 - February 22, 2003
+  June 14, 2002 - February 26, 2003
 */
 
 
-#define VER_VERSION     "0.9.10"
-#define VER_DATE        "2003.02.22"
+#define VER_VERSION     "0.9.11"
+#define VER_DATE        "2003.02.26"
 
 
 /* #define DEBUG */
@@ -3658,16 +3658,6 @@ void setup(int argc, char * argv[])
 
   /* Set up language: */
 
-  /* ja_JP.eucJP locale is usually used for Japanese, but SDL_ttf does NOT
-     support it! - TOYAMA Shin-ichi <kyone@tky2.3web.ne.jp> - 2003.01.24 */
-
-  if (langstr == NULL && getenv("LANG") != NULL &&
-      strcmp(getenv("LANG"), "ja_JP.eucJP") == 0)
-  {
-    langstr = strdup("japanese");
-  }
-
-
   if (langstr != NULL)
   {
     if (strcmp(langstr, "english") == 0 ||
@@ -3813,6 +3803,9 @@ void setup(int argc, char * argv[])
 
   language = current_language();
 
+  if (language == LANG_JA)
+    putenv("OUTPUT_CHARSET=ja_JP.UTF-8");
+
 
 #ifdef DEBUG
   printf("DEBUG: Language is %s (%d)\n", lang_prefixes[language], language);
@@ -4252,6 +4245,7 @@ void setup(int argc, char * argv[])
       /* Revert to default: */
       
       putenv("LANG=C");
+      putenv("OUTPUT_CHARSET=C");
       setlocale(LC_ALL, "");
 
       bindtextdomain("tuxpaint", LOCALEDIR);