Index: packages.ent
===================================================================
--- packages.ent	(revision 4237db81c0a6217d34d18d40a205ab7df21d2e95)
+++ packages.ent	(revision 64e1bfa728964913939f98eac6a7beb9c54b9924)
@@ -589,5 +589,5 @@
 <!ENTITY balsa-version                "2.5.1">
 <!ENTITY ekiga-version                "4.0.1">
-<!ENTITY fontforge-version            "2.0.20140101">
+<!ENTITY fontforge-version            "20141126">
 <!ENTITY gparted-version              "0.20.0">
 <!ENTITY gnash-version                "0.8.10">
Index: xsoft/other/fontforge-systemd.xml
===================================================================
--- xsoft/other/fontforge-systemd.xml	(revision 64e1bfa728964913939f98eac6a7beb9c54b9924)
+++ xsoft/other/fontforge-systemd.xml	(revision 64e1bfa728964913939f98eac6a7beb9c54b9924)
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/20141126/fontforge-2014-11-26-Unix-Source.tar.gz">
+  <!ENTITY fontforge-download-ftp  " ">
+  <!ENTITY fontforge-md5sum        "2193a30700a56aa7c466407ac37ce0e3">
+  <!ENTITY fontforge-size          "119.2 MB">
+  <!ENTITY fontforge-buildsize     "354.8 MB">
+  <!ENTITY fontforge-time          "3.9 SBU">
+]>
+
+<sect1 id="fontforge" xreflabel="FontForge-&fontforge-version;">
+  <?dbhtml filename="fontforge.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>FontForge-&fontforge-version;</title>
+
+  <indexterm zone="fontforge">
+    <primary sortas="a-FontForge">FontForge</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to FontForge</title>
+
+    <para>
+      The <application>FontForge</application> package contains an
+      outline font editor that lets you create your own postscript,
+      truetype, opentype, cid-keyed, multi-master, cff, svg and
+      bitmap (bdf, FON, NFNT) fonts, or edit existing ones.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&fontforge-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&fontforge-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &fontforge-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &fontforge-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &fontforge-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &fontforge-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+    <para>
+      The <application>FontForge</application> tarball extracts 
+      to fontforge-20141126.
+    </para>
+    </note>
+
+    <bridgehead renderas="sect3">FontForge Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="cairo"/>,
+      <xref linkend="freetype2"/>,
+      <xref linkend="harfbuzz"/>,
+      <xref linkend="gtk2"/>,      
+      <xref linkend="libxml2"/> and
+      <xref linkend="xorg7-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="giflib"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libpng"/>,
+      <xref linkend="libtiff"/>,
+      <xref linkend="pango"/>,
+      <xref linkend="python2"/>,
+      <ulink url="https://github.com/fontforge/libspiro">libspiro</ulink>,
+      <ulink url="https://bitbucket.org/sortsmill/libunicodenames">
+      libunicodenames</ulink>,
+      <ulink url="https://github.com/fontforge/libuninameslist">
+      libuninameslist</ulink>, and
+      <ulink url="http://www.zeromq.org/">libzmq</ulink>,
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/fontforge"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of FontForge</title>
+
+    <para>
+      Install <application>FontForge</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./bootstrap --force &amp;&amp;
+./configure --prefix=/usr    \
+            --disable-static \
+            --enable-gtk2-use \
+            --docdir=/usr/share/doc/fontforge-&fontforge-version; &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make -k check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          fontforge, fontimage, fontlint and sfddiff
+        </seg>
+        <seg>
+          libfontforgeexe.so, libfontforge.so, libgdraw.so,
+          libgioftp.so, libgunicode.so and libgutils.so
+        </seg>
+        <seg>
+          /usr/include/fontforge,
+          /usr/share/doc/fontforge-&fontforge-version; and
+          /usr/share/fontforge
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="fontforge-prog">
+        <term><command>fontforge</command></term>
+        <listitem>
+          <para>
+            is a program that allows you to create and
+            modify font files.
+          </para>
+          <indexterm zone="fontforge fontforge-prog">
+            <primary sortas="b-fontforge">fontforge</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fontimage">
+        <term><command>fontimage</command></term>
+        <listitem>
+          <para>
+            is a program that produces an image showing
+            representative glyphs of the font.
+          </para>
+          <indexterm zone="fontforge fontimage">
+            <primary sortas="b-fontimage">fontimage</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fontlint">
+        <term><command>fontlint</command></term>
+        <listitem>
+          <para>
+            is a program that checks the font for certain
+            common errors.
+          </para>
+          <indexterm zone="fontforge fontlint">
+            <primary sortas="b-fontlint">fontlint</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sfddiff">
+        <term><command>sfddiff</command></term>
+        <listitem>
+          <para>
+            is a program that compares two font files.
+          </para>
+          <indexterm zone="fontforge sfddiff">
+            <primary sortas="b-sfddiff">sfddiff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: oft/other/fontforge.xml
===================================================================
--- xsoft/other/fontforge.xml	(revision 4237db81c0a6217d34d18d40a205ab7df21d2e95)
+++ 	(revision )
@@ -1,240 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY fontforge-download-http "&sources-anduin-other-http;/fontforge-&fontforge-version;.tar.xz">
-  <!ENTITY fontforge-download-ftp  " ">
-  <!ENTITY fontforge-md5sum        "024ebb9dca824154fc19310b675f9d50">
-  <!ENTITY fontforge-size          "14 MB">
-  <!ENTITY fontforge-buildsize     "235 MB">
-  <!ENTITY fontforge-time          "2.2 SBU">
-]>
-
-<sect1 id="fontforge" xreflabel="FontForge-&fontforge-version;">
-  <?dbhtml filename="fontforge.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>FontForge-&fontforge-version;</title>
-
-  <indexterm zone="fontforge">
-    <primary sortas="a-FontForge">FontForge</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to FontForge</title>
-
-    <para>
-      The <application>FontForge</application> package contains an
-      outline font editor that lets you create your own postscript,
-      truetype, opentype, cid-keyed, multi-master, cff, svg and
-      bitmap (bdf, FON, NFNT) fonts, or edit existing ones.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fontforge-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fontforge-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fontforge-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fontforge-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fontforge-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fontforge-time;
-        </para>
-      </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">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cairo"/>,
-      <xref linkend="freetype2"/>,
-      <xref linkend="libxml2"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="giflib"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="pango"/>,
-      <xref linkend="python2"/>,
-      <ulink url="https://github.com/fontforge/libspiro">libspiro</ulink>,
-      <ulink url="https://bitbucket.org/sortsmill/libunicodenames">
-      libunicodenames</ulink>,
-      <ulink url="https://github.com/fontforge/libuninameslist">
-      libuninameslist</ulink>, and
-      <ulink url="http://www.zeromq.org/">libzmq</ulink>,
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/fontforge"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of FontForge</title>
-
-    <para>
-      First, fix building with recent versions of <application>Giflib</application>:
-    </para>
-
-<screen><userinput>sed "/DGifCloseFile/s:gif:&amp;, NULL:g" -i gutils/gimagereadgif.c</userinput></screen>
-
-    <para>
-      Install <application>FontForge</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/fontforge-&fontforge-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>. Test 32
-      fails for unknown reasons.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If desired, install desktop support files as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>rm -rf desktop/icons/src &amp;&amp;
-cp -rf desktop/icons/* /usr/share/icons/hicolor &amp;&amp;
-install -Dm644 desktop/fontforge.desktop /usr/share/applications/fontforge.desktop &amp;&amp;
-install -Dm644 desktop/fontforge.xml /usr/share/mime/packages/fontforge.xml</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          fontforge, fontimage, fontlint and sfddiff
-        </seg>
-        <seg>
-          libfontforgeexe.so, libfontforge.so, libgdraw.so,
-          libgioftp.so, libgunicode.so and libgutils.so
-        </seg>
-        <seg>
-          /usr/include/fontforge,
-          /usr/share/doc/fontforge-&fontforge-version; and
-          /usr/share/fontforge
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fontforge-prog">
-        <term><command>fontforge</command></term>
-        <listitem>
-          <para>
-            is a program that allows you to create and
-            modify font files.
-          </para>
-          <indexterm zone="fontforge fontforge-prog">
-            <primary sortas="b-fontforge">fontforge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fontimage">
-        <term><command>fontimage</command></term>
-        <listitem>
-          <para>
-            is a program that produces an image showing
-            representative glyphs of the font.
-          </para>
-          <indexterm zone="fontforge fontimage">
-            <primary sortas="b-fontimage">fontimage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fontlint">
-        <term><command>fontlint</command></term>
-        <listitem>
-          <para>
-            is a program that checks the font for certain
-            common errors.
-          </para>
-          <indexterm zone="fontforge fontlint">
-            <primary sortas="b-fontlint">fontlint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sfddiff">
-        <term><command>sfddiff</command></term>
-        <listitem>
-          <para>
-            is a program that compares two font files.
-          </para>
-          <indexterm zone="fontforge sfddiff">
-            <primary sortas="b-sfddiff">sfddiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xsoft/other/other.xml
===================================================================
--- xsoft/other/other.xml	(revision 4237db81c0a6217d34d18d40a205ab7df21d2e95)
+++ xsoft/other/other.xml	(revision 64e1bfa728964913939f98eac6a7beb9c54b9924)
@@ -21,5 +21,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="balsa.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ekiga.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fontforge.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fontforge-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gimp-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnash.xml"/>
