diff --git a/general/graphlib/gegl.xml b/general/graphlib/gegl.xml
index 6120cb2265..155e8d0c94 100644
--- a/general/graphlib/gegl.xml
+++ b/general/graphlib/gegl.xml
@@ -91,29 +91,29 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink>,
       <xref linkend="cairo"/>,
       <xref linkend="enscript"/>,
       <xref linkend="exiv2"/>,
       <xref linkend="ffmpeg"/>,
       <xref linkend="gdk-pixbuf"/>,
       <xref linkend="graphviz"/>,
-      <ulink url="http://lensfun.berlios.de/">lensfun</ulink>,
       <xref linkend="libjpeg"/>,
-      <ulink url="http://libopenraw.freedesktop.org/wiki/">libopenraw</ulink>,
       <xref linkend="libpng"/>,
       <xref linkend="librsvg"/>,
-      <ulink url="http://libspiro.sourceforge.net/">libspiro</ulink>,
       <xref linkend="lua"/>,
-      <ulink url="http://www.openexr.org">OpenEXR</ulink>,
       <xref linkend="pango"/>,
       <xref linkend="python2"/>,
       <xref linkend="ruby"/>,
       <xref linkend="sdl"/>,
       <xref linkend="gobject-introspection"/>,
       <xref linkend="vala"/>,
-      <xref linkend="w3m"/> and
-      <ulink url="http://www.cise.ufl.edu/research/sparse/umfpack/">libumfpack</ulink>
+      <xref linkend="w3m"/>,
+      <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink>,
+      <ulink url="http://lensfun.berlios.de/">lensfun</ulink>,
+      <ulink url="http://libopenraw.freedesktop.org/wiki/">libopenraw</ulink>,
+      <ulink url="http://libspiro.sourceforge.net/">libspiro</ulink>,
+      <ulink url="http://www.cise.ufl.edu/research/sparse/umfpack/">libumfpack</ulink>, and
+      <ulink url="http://www.openexr.org">OpenEXR</ulink>
     </para>
 
     <para condition="html" role="usernotes">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 5adaf38312..c3c9582822 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,10 @@
     <listitem>
       <para>June 15th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to fontforge-20150612.  Fixes
+          <ulink url="&blfs-ticket-root;6607">#6607</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - Update to postgresql-9.4.4.  Fixes
           <ulink url="&blfs-ticket-root;6606">#6606</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index d0c5a4aa97..dee597d761 100644
--- a/packages.ent
+++ b/packages.ent
@@ -604,7 +604,7 @@
 <!ENTITY ekiga-version                "4.0.1">
 <!ENTITY feh-version                  "2.13.1">
 <!--<!ENTITY fontforge-date               "2015-02-28">-->
-<!ENTITY fontforge-version            "20150330">
+<!ENTITY fontforge-version            "20150612">
 <!ENTITY gparted-version              "0.22.0">
 <!ENTITY gimp-version                 "2.8.14">
 <!ENTITY hexchat-version              "2.10.2">
diff --git a/xsoft/other/fontforge.xml b/xsoft/other/fontforge.xml
index 5bf6decfaf..5131546d62 100644
--- a/xsoft/other/fontforge.xml
+++ b/xsoft/other/fontforge.xml
@@ -7,10 +7,10 @@
 <!--  <!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-version;.tar.gz">
   <!ENTITY fontforge-download-ftp  " ">
-  <!ENTITY fontforge-md5sum        "210839cf621de2b19929e57964509260">
-  <!ENTITY fontforge-size          "118 MB">
-  <!ENTITY fontforge-buildsize     "395 MB">
-  <!ENTITY fontforge-time          "2.1 SBU (additional 0.3 SBU for the tests)">
+  <!ENTITY fontforge-md5sum        "a68cd6797e2e5fb0aa88a33bbe15315b">
+  <!ENTITY fontforge-size          "120 MB">
+  <!ENTITY fontforge-buildsize     "406 MB (with tests)">
+  <!ENTITY fontforge-time          "2.4 SBU (with tests)">
 ]>
 
 <sect1 id="fontforge" xreflabel="FontForge-&fontforge-version;">
@@ -37,7 +37,7 @@
       bitmap (bdf, FON, NFNT) fonts, or edit existing ones.
     </para>
 
-    &lfs77_checked;
+    &lfs77_checked; &gcc5_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
 
@@ -100,12 +100,13 @@
       <xref linkend="libpng"/>,
       <xref linkend="libtiff"/>,
       <xref linkend="python2"/>,
+      <ulink url="http://ipython.org/">IPython</ulink>,
       <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>,
+      <ulink url="http://www.zeromq.org/">zeromq (libzmq)</ulink>,
     </para>
 
     <para condition="html" role="usernotes">
@@ -140,6 +141,13 @@ make</userinput></screen>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
+    <note>
+      <para>
+        <application>Fontforge</application> needs to be started from command
+        line, for some desktop environments and window managers.
+      </para>
+    </note>
+
   </sect2>
 
   <sect2 role="commands">