diff --git a/docs/TODO.txt b/docs/TODO.txt
index c1569bbab..ff94d516f 100644
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -6,7 +6,7 @@ Copyright (c) 2004 by Bill Kendrick
 bill@newbreedsoftware.com
 http://www.newbreedsoftware.com/tuxpaint/
 
-June 1, 2004
+June 11, 2004
 
 HIGH-PRIORITY DOCUMENTATION CHANGES:
 ------------------------------------
@@ -31,6 +31,10 @@ LOW-PRIORITY DOCUMENTATION CHANGES:
 
 HIGH-PRIORITY IMPLEMENTATION CHANGES:
 -------------------------------------
+  * Use 'default.ttf' font to display un-translated strings.
+    (Hindi 'Shusha' font simply maps A-Z, a-z, etc. to Hindi characters, so
+    untranslated strings appear as nonsense!)
+
   * Provide a more Mac OS X style for handling configuration
     (don't use "~/.tuxpaintrc"; see the FIXME in src/tuxpaint.c)
 
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index b36d886fd..622cd0425 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -4504,8 +4504,8 @@ void setup(int argc, char * argv[])
 	}
       else if (strcmp(langstr, "hindi") == 0)
 	{
-	  putenv("LANG=hi_IN");
-	  putenv("LC_ALL=hi_IN");
+	  putenv("LANG=hi_IN.UTF8");
+	  putenv("LC_ALL=hi_IN.UTF8");
 	}
       else if (strcmp(langstr, "hungarian") == 0 ||
 	       strcmp(langstr, "magyar") == 0)