Index: general/genlib/aspell.xml
===================================================================
--- general/genlib/aspell.xml	(revision d98395201dbbcb4082f51dbafefe2d4dd7d620ab)
+++ general/genlib/aspell.xml	(revision d45a9e6935c7f4dcba693a2d83eb915a09013196)
@@ -6,5 +6,5 @@
 
   <!ENTITY aspell-download-http
-    "http://ftp.gnu.org/gnu/aspell/aspell-&aspell-version;.tar.gz">
+    "https://ftp.gnu.org/gnu/aspell/aspell-&aspell-version;.tar.gz">
   <!ENTITY aspell-download-ftp
     "ftp://ftp.gnu.org/gnu/aspell/aspell-&aspell-version;.tar.gz">
@@ -84,5 +84,5 @@
       <listitem>
         <para>
-          Aspell dictionaries: <ulink url="ftp://ftp.gnu.org/gnu/aspell/dict"/>
+          Aspell dictionaries: <ulink url="https://ftp.gnu.org/gnu/aspell/dict"/>
         </para>
       </listitem>
@@ -121,4 +121,6 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
+ln -svfn aspell-0.60 /usr/lib/aspell &amp;&amp;
+
 install -v -m755 -d /usr/share/doc/aspell-&aspell-version;/aspell{,-dev}.html &amp;&amp;
 
@@ -144,14 +146,20 @@
  </sect2>
 
- <!-- <sect2 role="commands">
+ <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para>
-      <command>make -C manual pdf</command>: This command is listed twice as the
-      first time it runs it will display an error and abort, although it creates
-      the requested file. Running the command again ensures the other file is
-      also created.
-    </para>
-  </sect2> -->
+<!--    <para>
+      <command>make -C manual pdf</command>: This command is listed twice as
+      the first time it runs it will display an error and abort, although it
+      creates the requested file. Running the command again ensures the other
+      file is also created.
+    </para>
+    -->
+    <para>
+      <command>ln -svfn aspell-0.60 /usr/lib/aspell</command>: This command is
+      useful for configuration of other applications, such as
+      <xref linkend="enchant"/>.
+    </para>
+  </sect2>
 
   <sect2 role="configuration">
Index: general/genlib/enchant.xml
===================================================================
--- general/genlib/enchant.xml	(revision d98395201dbbcb4082f51dbafefe2d4dd7d620ab)
+++ general/genlib/enchant.xml	(revision d45a9e6935c7f4dcba693a2d83eb915a09013196)
@@ -8,7 +8,7 @@
   <!ENTITY enchant-download-ftp  "ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/enchant-&enchant-version;.tar.gz">
   <!ENTITY enchant-md5sum        "de11011aff801dc61042828041fb59c7">
-  <!ENTITY enchant-size          "593 KB">
-  <!ENTITY enchant-buildsize     "17 MB">
-  <!ENTITY enchant-time          "0.3 SBU">
+  <!ENTITY enchant-size          "596 KB">
+  <!ENTITY enchant-buildsize     "11 MB">
+  <!ENTITY enchant-time          "0.1 SBU">
 ]>
 
@@ -82,5 +82,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -90,4 +90,12 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -113,5 +121,30 @@
     <sect3><title>Configuration Information</title>
 
-      <para>See more details in the enchant(1) manual page.</para>
+      <para>
+        If you whish to use the <xref linkend="aspell"/> backend, create a
+        symlink, as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>ln -svfn ../../lib/aspell /usr/share/enchant/aspell</userinput></screen>
+
+      <para>
+        You can test your installation and configuration by creating a test
+        file and running the commands:
+      </para>
+
+<screen><userinput>cat &gt; /tmp/test-enchant.txt &lt;&lt; "EOF" &amp;&amp; 
+<literal>Tel me more abot linux
+Ther ar so many commads</literal>
+EOF
+
+enchant -d en_GB -l /tmp/test-enchant.txt &amp;&amp;
+enchant -d en_GB -a /tmp/test-enchant.txt</userinput></screen>
+
+      <para>
+        where you can replace the dictionary for en_GB by any other you
+        downloaded (find the instructions earlier in the present page). You
+        will see a list of the misspelled words followed by a list of
+        alternatives for them. See more details in the enchant manual page.
+      </para>
 
     </sect3>
@@ -129,6 +162,6 @@
       <seglistitem>
         <seg>enchant and enchant-lsmod</seg>
-        <seg>libenchant.{so,a} and various backend libraries</seg>
-        <seg>/usr/{include/enchant,lib/enchant,share/enchant}</seg>
+        <seg>libenchant.so and various backend libraries</seg>
+        <seg>/usr/{include,lib,share}/enchant</seg>
       </seglistitem>
     </segmentedlist>
Index: gnome.ent
===================================================================
--- gnome.ent	(revision d98395201dbbcb4082f51dbafefe2d4dd7d620ab)
+++ gnome.ent	(revision d45a9e6935c7f4dcba693a2d83eb915a09013196)
@@ -40,5 +40,5 @@
 <!ENTITY evince-version               "3.16.0">
 <!ENTITY file-roller-version          "3.14.2">
-<!ENTITY gedit-version                "3.14.3">
+<!ENTITY gedit-version                "3.16.0">
 <!ENTITY gnome-calculator-version     "3.14.1">
 <!ENTITY gnome-nettool-version        "3.8.1">
Index: gnome/applications/gedit.xml
===================================================================
--- gnome/applications/gedit.xml	(revision d98395201dbbcb4082f51dbafefe2d4dd7d620ab)
+++ gnome/applications/gedit.xml	(revision d45a9e6935c7f4dcba693a2d83eb915a09013196)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/&gnome-minor-14;/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/&gnome-minor-14;/gedit-&gedit-version;.tar.xz">
-  <!ENTITY gedit-md5sum        "267beb4476f48a106fb693bb55819caf">
+  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/&gnome-minor-16;/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/&gnome-minor-16;/gedit-&gedit-version;.tar.xz">
+  <!ENTITY gedit-md5sum        "661468539440b7b4f94dd285d7969442">
   <!ENTITY gedit-size          "2.8 MB">
-  <!ENTITY gedit-buildsize     "87 MB">
-  <!ENTITY gedit-time          "1.1 SBU">
+  <!ENTITY gedit-buildsize     "93 MB">
+  <!ENTITY gedit-time          "0.9 SBU">
 ]>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision d98395201dbbcb4082f51dbafefe2d4dd7d620ab)
+++ introduction/welcome/changelog.xml	(revision d45a9e6935c7f4dcba693a2d83eb915a09013196)
@@ -49,4 +49,15 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Update to Gedit-3.16.0. Partially fixes
+          <ulink url="&blfs-ticket-root;6311">#6311</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Enchant-1.6.0: disable-static, fixes
+          and tweaks.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Aspell-0.60.6.1: tweaks.</para>
+        </listitem>
+        <listitem>
           <para>[pierre] - Update to Mesa-10.5.2. Fixes
           <ulink url="&blfs-ticket-root;6340">#6340</ulink>.</para>
