Index: basicnet/textweb/links.xml
===================================================================
--- basicnet/textweb/links.xml	(revision 2a0dbb1ed0e7f6b993a518c5bdf252785174e9d5)
+++ basicnet/textweb/links.xml	(revision 1ad30c22d51ab93d36eecde2931a94675500eeb5)
@@ -35,13 +35,50 @@
     and has many other features.</para>
     
-    <caution>
-      <para>In the text mode, <application>Links</application> cannot be
-      configured to use UTF-8 encoding for the terminal output. This
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&links-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&links-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &links-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &links-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &links-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &links-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Recommended patch: <ulink
+          url="&gentoo-ftp-repo;/links-&Links-version;-utf8.diff.bz2"/></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Do I Need the Patch and Do I Have to Enable
+    Graphics Support?</bridgehead>
+
+      <para>In text mode, <application>Links</application> cannot be
+      configured to use UTF-8 encoding for the terminal input/output. This
       limitation renders <application>Links</application> useless as a
       text-based browser in UTF-8 locales. See general discussion of this
       type of issue in the <xref linkend="locale-not-valid-option"/> section
-      on the <xref linkend="locale-issues"/> page.</para>
-
-      <para>In the graphical mode,
+      on the <xref linkend="locale-issues"/> page.
+      The patch fixes all these issues with an exception of Chinese locale,
+      when there isn't an available character set.
+      Note: You have to check the "UTF-8 I/O" box in "Terminal options" and
+      set the character set (probably an 8-bit) in the Setup menu.
+      </para>
+
+      <para>In graphical mode,
       <application>Links</application> displays text correctly even in
       UTF-8 locales, if all characters exist in the built-in font used by
@@ -49,27 +86,4 @@
       is handled correctly when running in X11-based (but not framebuffer-based)
       graphical mode.</para>
-    </caution>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&links-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&links-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &links-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &links-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &links-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &links-time;</para>
-      </listitem>
-    </itemizedlist>
 
     <bridgehead renderas="sect3">Links Dependencies</bridgehead>
@@ -96,9 +110,17 @@
   <sect2 role="installation">
     <title>Installation of Links</title>
-
-    <para>Install <application>Links</application> by running the following
+   
+   <para>If desired, apply the patch:</para>
+
+<screen><userinput>bzcat ../links-&Links-version;-utf8.diff.bz2 | patch -p1 &amp;&amp;
+cd intl &amp;&amp;
+./gen-intl &amp;&amp; ./synclang &amp;&amp;
+cd ..
+</userinput></screen>
+   
+   <para>Install <application>Links</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --enable-graphics &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -116,5 +138,8 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
+    
+    <para><command>./gen-intl &amp;&amp; ./synclang</command>: These commands
+    regenerate the language table.</para>
+    
     <para><option>--enable-graphics</option>: This switch enables support
     for graphics mode. You will either need to install the
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 2a0dbb1ed0e7f6b993a518c5bdf252785174e9d5)
+++ introduction/welcome/changelog.xml	(revision 1ad30c22d51ab93d36eecde2931a94675500eeb5)
@@ -45,4 +45,8 @@
       <para>March 8th, 2008</para>
       <itemizedlist>
+        <listitem>
+          <para>[ag] - Added a patch to fix the UTF-8 related issues in Links.
+          </para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Fixed problem with netfs bootscript boot procedure.</para>
