--- texinfo/info/info.c	2005/08/19 22:23:54	1.13
+++ texinfo/info/info.c	2006/08/13 23:36:22	1.14
@@ -154,6 +154,10 @@
 #ifdef HAVE_SETLOCALE
   /* Set locale via LC_ALL.  */
   setlocale (LC_ALL, "");
+  /* But don't use translated messages in the case when
+     string width and length can differ */
+  if (MB_CUR_MAX > 1)
+    setlocale(LC_MESSAGES, "C");
 #endif
 
 #ifdef ENABLE_NLS
--- texinfo/info/man.c	2005/06/03 23:53:20	1.6
+++ texinfo/info/man.c	2006/08/13 23:36:22	1.7
@@ -325,6 +325,17 @@
       freopen (NULL_DEVICE, "r", stdin);
       dup2 (pipes[1], fileno (stdout));
 
+      if (MB_CUR_MAX > 1)
+        {
+          /* Info has trouble wrapping man output if it contains
+             multibyte characters */
+          setenv("LANGUAGE", "C", 1);
+          setenv("LANG", "C", 1);
+          setenv("LC_MESSAGES", "C", 1);
+          setenv("LC_CTYPE", "C", 1);
+          setenv("LC_ALL", "C", 1);
+        }
+
       execv (formatter_args[0], formatter_args);
 
       /* If we get here, we couldn't exec, so close out the pipe and