Index: xsoft/other/fontforge.xml
===================================================================
--- xsoft/other/fontforge.xml	(revision 7c44034b84bb2b9b08e29956bd4a2f021e7007b3)
+++ xsoft/other/fontforge.xml	(revision e7af045de0b6b02036f28c73074bb750ea9767bf)
@@ -6,8 +6,8 @@
 
 <!--  <!ENTITY fontforge-download-http "&sources-anduin-other-http;/fontforge-&fontforge-version;.tar.xz">-->
-  <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-&fontforge-date;-Unix-Source.tar.gz">
+  <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-&fontforge-version;.tar.gz">
   <!ENTITY fontforge-download-ftp  " ">
-  <!ENTITY fontforge-md5sum        "2193a30700a56aa7c466407ac37ce0e3">
-  <!ENTITY fontforge-size          "120 MB">
+  <!ENTITY fontforge-md5sum        "05b70afc83228d9d415046563f4bf01b">
+  <!ENTITY fontforge-size          "117 MB">
   <!ENTITY fontforge-buildsize     "355 MB">
   <!ENTITY fontforge-time          "2.1 SBU (additional 0.3 SBU for the tests)">
@@ -42,18 +42,4 @@
     <bridgehead renderas="sect3">Package Information</bridgehead>
 
-    <note>
-
-      <para>The download link below obtains
-      <filename>fontforge-&fontforge-date;-Unix-Source.tar.gz</filename>. This
-      is not the correct name for the archive, because it saves the file as
-      <filename class="directory">fontforge-&fontforge-version;</filename>. The
-      file should be renamed to the correct filename
-      <filename>fontforge-&fontforge-version;.tar.gz</filename>. You can
-      achieve this automatically by using the command:</para>
-    
- <screen><userinput> wget -c <ulink url="&fontforge-download-http;"/> \
-      -O fontforge-&fontforge-version;.tar.gz</userinput></screen>
-    </note>
-
     <itemizedlist spacing="compact">
       <listitem>
@@ -88,22 +74,19 @@
       </listitem>
     </itemizedlist>
-<!--
-    <para>
-      The <application>FontForge</application> tarball specified above was not
-      generated by the <application>FontForge</application> maintainers. It
-      was created by the BLFS team by pulling a Git version and then generating 
-      the autotools components and documentation. The BLFS team made no changes 
-      to the existing source files.
-    </para>-->
 
     <bridgehead renderas="sect3">FontForge Dependencies</bridgehead>
 
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="freetype2"/>,
+      <xref linkend="glib2"/>,  and
+      <xref linkend="libxml2"/>
+    </para>
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="cairo"/>,
-      <xref linkend="freetype2"/>,
+      <xref linkend="gtk2"/>,
       <xref linkend="harfbuzz"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="libxml2"/> and
+      <xref linkend="pango"/> (required if Xorg libraries are present), and
       <xref linkend="xorg7-lib"/>
     </para>
@@ -115,5 +98,4 @@
       <xref linkend="libpng"/>,
       <xref linkend="libtiff"/>,
-      <xref linkend="pango"/>,
       <xref linkend="python2"/>,
       <ulink url="https://github.com/fontforge/libspiro">libspiro</ulink>,
@@ -138,6 +120,8 @@
     </para>
 
-<screen><userinput>rm -rf libltdl &amp;&amp;
-./bootstrap --force &amp;&amp;
+<screen><userinput>
+rm -rf libltdl &amp;&amp;
+rm m4/argz.m4  &amp;&amp;
+./bootstrap    &amp;&amp;
 ./configure --prefix=/usr     \
             --enable-gtk2-use \
@@ -161,8 +145,18 @@
     <title>Command Explanations</title>
 
-    <para><command>rm -rf libltdl &amp;&amp; ./bootstrap --force</command>:
-    These two commands work around the old version of libtool in the source,
-    and the idiosyncracies of the bootstrap command, to allow it to build with
-    current libtool where some files have been renamed.</para>
+    <para>
+      <command>rm -rf libltdl ... ./bootstrap</command>:
+      These commands work around the old version of libtool in the source,
+      and the idiosyncracies of the bootstrap command, to allow it to build with
+      current libtool where some files have been renamed.
+    </para>
+
+    <para>
+      <parameter>--enable-gtk2-use</parameter>: allows to use the GTK+2 graphics
+      instead of basic Xorg graphics.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
