diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 970b02369f..67438d8ba9 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -22,6 +22,10 @@ who wrote what.</para>
 
 <itemizedlist>
 
+<listitem><para>October 7th, 2004 [igor]: Added G_FILENAME_ENCODING
+environment variable to i18n startup file and lang archive to Vim page,
+suggested by Alexander E. Patrakov (bug 909).</para></listitem>
+
 <listitem><para>October 7th, 2004 [randy]: Modified configure switches
 in Inetutils instructions to match LFS and added an optional dependency; 
 shortened sed command in XFree86 and Xorg instructions.</para></listitem>
diff --git a/postlfs/config/profile.xml b/postlfs/config/profile.xml
index 3558d11741..ca6b03286d 100644
--- a/postlfs/config/profile.xml
+++ b/postlfs/config/profile.xml
@@ -323,11 +323,18 @@ can be obtained by running the following command:</para>
 # Set up i18n variables
 export LC_ALL=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>
 export LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>
+export G_FILENAME_ENCODING=@locale
 <command>EOF</command></userinput></screen>
 
-<para>Note: Setting LC_ALL sets the same value for all locale categories. For 
+<para>The <envar>LC_ALL</envar> variable sets the same value for all locale categories. For 
 better control, you may prefer to set values individually for all categories 
 listed in the output of the <command>locale</command> command.</para>
+
+<para>The <envar>G_FILENAME_ENCODING</envar> variable tells applications
+such as <application>Glib</application> and
+<application><acronym>GTK</acronym>+</application> that filenames are in
+the default locale encoding and not in <acronym>UTF</acronym>-8 as
+assumed by default.</para>
 </sect3>
 
 <sect3>
diff --git a/postlfs/editors/vim.xml b/postlfs/editors/vim.xml
index 5f4879281d..7bbedd45bd 100644
--- a/postlfs/editors/vim.xml
+++ b/postlfs/editors/vim.xml
@@ -49,6 +49,13 @@ url="&vim-download-ftp;"/></para></listitem>
 &vim-time;</para></listitem></itemizedlist>
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Translated Vim messages <ulink
+url="http://ftp.at.vim.org/pub/vim/extra/vim-6.3-lang.tar.gz"/>
+</para></listitem>
+</itemizedlist></sect3>
+
 <sect3><title><application>Vim</application> dependencies</title>
 <sect4><title>Recommended</title>
 <para><application>X</application> 
@@ -77,7 +84,8 @@ install an additional editor, not link vim against X, or move the current
 <command>vim</command> executable to the <filename>/bin</filename> directory 
 under a different name such as <filename>vi</filename>.</para></note>
 
-<para>Install <application>Vim</application> by running the following commands:</para>
+<para>Unpack the translated messages archive if desired and install
+<application>Vim</application> by running the following commands:</para>
 
 <screen><userinput><command>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h &amp;&amp;
 echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h &amp;&amp;