Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision dc53944c6687c3c93b6da4e7dc1cc76cb4f03b0d)
+++ general/genutils/imagemagick.xml	(revision feb1a64938afdc507fb8a958ed879227affd5054)
@@ -6,18 +6,14 @@
 
   <!ENTITY imagemagick-patch-version "1">
-  <!-- Not sure what to do here as ImageMagick is one of the fastest-moving
-       targets in all of open-source. One solution is to always use the last
-       version of a specific major-minor from the 'legacy' subdirectory of
-       the path in these URL's. Otherwise these links are broken within days
-       after updates :-(  Unfortunately, versions always roll on after patch
-       version 10, whether or not significant changes occur, and it takes
-       time before versions migrate to legacy/  -->
 
   <!ENTITY imagemagick-download-http " ">
-  <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
+  <!ENTITY imagemagick-download-ftp  
+           "ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
   <!ENTITY imagemagick-md5sum        "bde038ae05fb20d29cebf88ab9cbdce5">
   <!ENTITY imagemagick-size          "7.2 MB">
-  <!ENTITY imagemagick-buildsize     "147 MB (with typical dependencies, additional 25 MB to run the test suite, reputedly 450 MB with all dependencies)">
-  <!ENTITY imagemagick-time          "2.5 SBU (typical build - additional 8.1 SBU to run the test suite and 15 SBU to run the validation suite)">
+  <!ENTITY imagemagick-buildsize
+           "147 MB (with typical dependencies, additional 25 MB to run the test suite, reputedly 450 MB with all dependencies)">
+  <!ENTITY imagemagick-time
+           "2.5 SBU (typical build - additional 8.1 SBU to run the test suite and 15 SBU to run the validation suite)">
 ]>
 
@@ -36,7 +32,5 @@
      constantly adding additional features and dependencies. -->
 
-
-<sect1 id="imagemagick"
-xreflabel="ImageMagick-&imagemagick-version;-&imagemagick-patch-version;">
+<sect1 id="imagemagick" xreflabel="ImageMagick-&imagemagick-version;-&imagemagick-patch-version;">
   <?dbhtml filename="imagemagick.html"?>
 
@@ -105,5 +99,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="x-window-system"/>
+      <xref linkend="xorg7-lib"/>
     </para>
 
@@ -126,32 +120,24 @@
       <xref linkend="cups"/>,
       <xref linkend="curl"/>,
+      <xref linkend="ffmpeg"/>,
+      <xref linkend="p7zip"/> (LZMA),
+      <xref linkend="sane"/>,
+      <xref linkend="wget"/>,
+      <xref linkend="xdg-utils"/>,
+      <xref linkend="xterm2"/>,
       <ulink url="http://dmalloc.com/">Dmalloc</ulink>,
       <ulink url="http://linux.softpedia.com/get/Programming/Debuggers/Electric-Fence-3305.shtml/">Electric Fence</ulink>,
-      <xref linkend="ffmpeg"/>,
       <ulink url="http://www.fftw.org/">FFTW</ulink>,
-      <ulink url="http://www.mupdf.com/">MuPDF</ulink>,
-<!--      <ulink url="http://www.gsp.com/support/virtual/email/pgp/">PGP</ulink> or -->
       <ulink url="http://www.openpgp.org/resources/downloads">PGP</ulink> or
       <xref linkend="gnupg2"/>
       (you'll have to do some hacking to use <application>GnuPG</application>),
-      <xref linkend="p7zip"/> (LZMA),
-      <ulink url="ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/profiles.zip">Profiles</ulink>,
-      <xref linkend="sane"/>,
+      <ulink url="ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/profiles.zip">Profiles</ulink>, and
       <ulink url="http://ufraw.sourceforge.net/">ufraw</ulink> (for raw formats listed in
-      <filename>www/formats.html</filename>),
-      <xref linkend="wget"/>, and
-      <xref linkend="xdg-utils"/>
+      <filename>www/formats.html</filename>)
     </para>
 
     <bridgehead renderas="sect4">Optional Graphics Libraries</bridgehead>
     <para role="optional">
-      <ulink url="http://corefonts.sourceforge.net/">corefonts</ulink>,
-      <ulink url="http://djvu.sourceforge.net/">DjVuLibre</ulink>,
-      <!-- <ulink url="http://www.i3a.org/i_flashpix.html">FlashPIX</ulink> (or -->
-      <ulink url="ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/">
-      FlashPIX (libfpx)</ulink>,
-      <!-- Added already from the Xorg recommended dependency <xref linkend="freetype2"/>, -->
       <xref linkend="jasper"/>,
-      <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>,
       <xref linkend="lcms"/> or
       <xref linkend="lcms2"/>,
@@ -162,8 +148,13 @@
       <xref linkend="libtiff"/>,
       <xref linkend="libwebp"/>,
+      <xref linkend="pango"/>,
+      <ulink url="http://djvu.sourceforge.net/">DjVuLibre</ulink>,
+      <ulink url="ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/">
+      FlashPIX (libfpx)</ulink>,
+      <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>,
+      <ulink url="&gnome-download-http;/libgxps/">libgxps</ulink>,
       <ulink url="http://liblqr.wikidot.com/en:download-page">Liquid Rescale</ulink>,
       <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
-      <xref linkend="openjpeg"/>,
-      <xref linkend="pango"/>, and
+      <ulink url="http://sourceforge.net/projects/openjpeg.mirror/">OpenJPEG 2</ulink>, and
       <ulink url="http://www.agocg.ac.uk/train/cgm/ralcgm.htm">RALCGM</ulink>
       (or <ulink url="http://www.mcmurchy.com/ralcgm/ralcgm-3.51.tar.gz">ralcgm</ulink>)
@@ -172,13 +163,13 @@
     <bridgehead renderas="sect4">Optional Graphics Utilities</bridgehead>
     <para role="optional">
-      <ulink url="http://www.blender.org/">Blender</ulink>,
-      <ulink url="http://dejavu.sourceforge.net/">DejaVu fonts</ulink>,
-      <ulink url="http://www.ghostscript.com/download/gpcldnld.html">GhostPCL</ulink> or
-      <ulink url="http://www.ghostscript.com/download/gpdldnld.html">GhostPDL</ulink>,
       <xref linkend="gs"/>,
       <xref linkend="gimp"/>,
-      <ulink url="http://www.gnuplot.info/">Gnuplot</ulink>,
       <xref linkend="graphviz"/>,
       <xref linkend="inkscape"/>,
+      <ulink url="http://www.blender.org/">Blender</ulink>,
+      <ulink url="http://corefonts.sourceforge.net/">corefonts</ulink>,
+      <ulink url="http://dejavu.sourceforge.net/">DejaVu fonts</ulink>,
+      <ulink url="http://www.ghostscript.com/download/gpcldnld.html">GhostPCL</ulink>,
+      <ulink url="http://www.gnuplot.info/">Gnuplot</ulink>,
       <ulink url="http://www.povray.org/">POV-Ray</ulink>, and
       <ulink url="http://radsite.lbl.gov/radiance/HOME.html">Radiance</ulink>
@@ -187,6 +178,7 @@
     <bridgehead renderas="sect4">Optional Conversion Tools</bridgehead>
     <para role="optional">
+      <xref linkend="enscript"/>,
+      <xref linkend="texlive"/>,
       <ulink url="http://autotrace.sourceforge.net/">AutoTrace</ulink>,
-      <xref linkend="enscript"/>,
       <ulink url="http://www.lizardtech.com/downloads/category/">
       GeoExpress Command Line Utilities, AKA MrSID Utilities (binary package)</ulink>,
@@ -194,12 +186,4 @@
       <ulink url="http://user.it.uu.se/~jan/html2ps.html">html2ps</ulink>,
       <ulink url="http://wvware.sourceforge.net/">libwmf</ulink>,
-      <ulink url="http://www.mpeg.org/MSSG/">MPEG-2 Video Codec</ulink>,
-      <ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink>,
-      <xref linkend="texlive"/>,
-      <ulink url="http://www.xfig.org/">Transfig</ulink>,
-      <!-- <ulink url="http://txt2html.sourceforge.net/">txt2html</ulink>
-      (requires Perl Module
-      <ulink url="http://cpan.org/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-1.11.tar.gz">
-      Getopt::ArgvFile</ulink>), and -->
       <ulink url="http://sk1project.org/modules.php?name=products&amp;product=uniconvertor">
       UniConvertor</ulink>, and
@@ -217,14 +201,10 @@
 
     <para>
-      Install <application>Imagemagick</application> by running the following commands:
-    </para>
-
-<!--   <note><para>
-      If Xorg is not installed in user, add the entry LDFLAGS=-L$XORG_PREFIX/lib
-      to the configure line.
-    </para></note>
--->
+      Install <application>ImageMagick</application> by running the following commands:
+    </para>
+
 <screen><userinput>./configure --prefix=/usr     \
             --sysconfdir=/etc \
+            --enable-hdri     \
             --with-modules    \
             --with-perl       \
@@ -247,26 +227,4 @@
     </para>
 
-    <!-- This is not necessary as the 'make install' process installs PerlMagick
-    <para>
-      And, if you built PerlMagick, still as the
-      <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make -C PerlMagick install</userinput></screen>
-    -->
-
-    <!-- Commenting this out for now as it is redundant to information
-         that has already been presented, or is in the 'command explanations'
-         section below.
-    <sect3>
-      <title>Additional Configure Options</title>
-
-      <para>There are additional switches that can be passed to
-      <application>ImageMagick</application> to customize the installation to
-      your needs. See <filename>advanced-unix-installation.html</filename> in
-      the <filename class='directory'>www</filename> directory.</para>
-
-    </sect3>
-    -->
-
   </sect2>
 
@@ -275,18 +233,16 @@
 
     <para>
-      <parameter>--sysconfdir=/etc</parameter>: Install the
-      <filename class="extension">.xml</filename> configuration files into
-      <filename class='directory'>/etc/ImageMagick</filename> instead of the
-      default <filename class='directory'>/usr/etc/ImageMagick</filename>.
-    </para>
-
-    <para>
-      <parameter>--with-modules</parameter>: Enables support for dynamically
-      loadable modules.
-    </para>
-
-    <para>
-      <parameter>--with-perl</parameter>: Enables building and installing
-      PerlMagick.
+      <parameter>--enable-hdri</parameter>: Enables building of a
+      high dynamic range version of ImageMagick.
+    </para>
+
+    <para>
+      <parameter>--with-modules</parameter>: Enables support for
+      dynamically loadable modules.
+    </para>
+
+    <para>
+      <parameter>--with-perl</parameter>: Enables building and
+      installing of PerlMagick.
     </para>
 
@@ -296,15 +252,6 @@
     </para>
 
-    <!-- The tests run fine if you run the validation suite after the package
-         is installed
-    <para>
-      <parameter>-without-magick-plus-plus</parameter>: Disables building
-      and installing Magick++.  All the test modules and demos for Magick++
-      currently fail.
-    </para>
-    -->
-
-    <para>
-      <option>--with-gslib=/usr/lib</option>: Enables support to use the
+    <para>
+      <option>--with-gslib</option>: Enables support to use the
       <application>Ghostscript</application> shared library.
     </para>
@@ -316,6 +263,6 @@
 
     <para>
-      <option>--with-autotrace</option>: Enables support to use the
-      <application>Autotrace</application> library.
+      <option>--with-autotrace</option>: Enables support to use
+      the <application>Autotrace</application> library.
     </para>
 
@@ -362,22 +309,23 @@
 
       <seglistitem>
-        <seg>animate, compare, composite, conjure, convert, display,
-        identify, import, Magick-config, Magick++-config, MagickCore-config,
-        MagickWand-config, mogrify, montage, stream, and Wand-config</seg>
-
-        <seg>libMagickCore-6.Q16.so, libMagickWand-6.Q16.so,
-        libMagick++-6.Q16.so,
-        numerous modules under
-        /usr/lib/ImageMagick-&imagemagick-version;/modules-Q16/{coders,filters}/,
-        /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/Image/Magick/Magick.so, and
-        /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/Image/Magick/Q16/Q16.so</seg>
-
-        <seg>/etc/ImageMagick-6,
-        /usr/include/ImageMagick-6,
-        /usr/lib/ImageMagick-&imagemagick-version;,
-        /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/Image,
-        /usr/lib/perl5/site_perl/&lfs-perl-version;/Image,
-        /usr/share/ImageMagick-6 and
-        /usr/share/doc/ImageMagick-6</seg>
+        <seg>
+          animate, compare, composite, conjure, convert, display,
+          identify, import, Magick-config, Magick++-config, MagickCore-config,
+          MagickWand-config, mogrify, montage, stream, and Wand-config
+        </seg>
+        <seg>
+          libMagickCore-6.Q16HDRI.so, libMagickWand-6.Q16HDRI.so, libMagick++-6.Q16HDRI.so,
+          /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/Image/Magick/Magick.so, and
+          /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/Image/Magick/Q16/Q16.so
+        </seg>
+        <seg>
+          /etc/ImageMagick-6,
+          /usr/include/ImageMagick-6,
+          /usr/lib/ImageMagick-&imagemagick-version;,
+          /usr/lib/perl5/site_perl/&lfs-perl-version;/auto/Image/Magick,
+          /usr/lib/perl5/site_perl/&lfs-perl-version;/Image/Magick,
+          /usr/share/ImageMagick-6, and
+          /usr/share/doc/ImageMagick-6
+        </seg>
       </seglistitem>
     </segmentedlist>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision dc53944c6687c3c93b6da4e7dc1cc76cb4f03b0d)
+++ introduction/welcome/changelog.xml	(revision feb1a64938afdc507fb8a958ed879227affd5054)
@@ -48,4 +48,19 @@
       <para>August 17th, 2014</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - FontForge-2.0.20140101: reorder external/internal
+          optional requirements.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Merge ImageMagick-6.8.9-1 from systemd.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - MIT Kerberos V5-1.12.2: fix 'import the public
+          key'. Thanks to Armin K. for reporting.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to pango-1.36.6. Fixes
+          <ulink url="&blfs-ticket-root;5393">#5393</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[rthomsen] - Update to akonadi-1.13.0. Fixes
Index: packages.ent
===================================================================
--- packages.ent	(revision dc53944c6687c3c93b6da4e7dc1cc76cb4f03b0d)
+++ packages.ent	(revision feb1a64938afdc507fb8a958ed879227affd5054)
@@ -441,5 +441,5 @@
 <!ENTITY libnotify-version            "0.7.6">
 <!ENTITY libxklavier-version          "5.3">
-<!ENTITY pango-version                "1.36.5">
+<!ENTITY pango-version                "1.36.6">
 <!ENTITY pangomm-version              "2.34.0">
 <!ENTITY qt4-version                  "4.8.6">
Index: postlfs/security/mitkrb.xml
===================================================================
--- postlfs/security/mitkrb.xml	(revision dc53944c6687c3c93b6da4e7dc1cc76cb4f03b0d)
+++ postlfs/security/mitkrb.xml	(revision feb1a64938afdc507fb8a958ed879227affd5054)
@@ -123,6 +123,8 @@
     <para>You will probably see output similar to:</para>
 
-<screen>gpg: Signature made Wed Aug  8 22:29:58 2012 GMT using RSA key ID F376813D
-gpg: Can't check signature: public key not found</screen>
+<screen><literal>gpg: Signature made Mon Aug 11 22:53:10 2014 GMT using RSA key ID 749D7889
+gpg: Good signature from "Tom Yu &lt;tlyu@mit.edu&gt;" [unknown]
+gpg: WARNING: This key is not certified with a trusted signature!
+gpg:          There is no indication that the signature belongs to the owner.</literal></screen>
 
     <para>
@@ -130,5 +132,5 @@
     </para>
 
-<screen><userinput>gpg2 --keyserver pgp.mit.edu --recv-keys 0xF376813D</userinput></screen>
+<screen><userinput>gpg2 --pgp2 --keyserver pgp.mit.edu --recv-keys 0x749D7889</userinput></screen>
 
     <para>
Index: x/lib/pango.xml
===================================================================
--- x/lib/pango.xml	(revision dc53944c6687c3c93b6da4e7dc1cc76cb4f03b0d)
+++ x/lib/pango.xml	(revision feb1a64938afdc507fb8a958ed879227affd5054)
@@ -190,6 +190,5 @@
         <seg>
           libpango-1.0.so, libpangocairo-1.0.so, libpangoft2-1.0.so,
-          and libpangoxft-1.0.so;
-          several modules under /usr/lib/pango/1.8.0/modules/
+          and libpangoxft-1.0.so
         </seg>
         <seg>
Index: xsoft/other/fontforge.xml
===================================================================
--- xsoft/other/fontforge.xml	(revision dc53944c6687c3c93b6da4e7dc1cc76cb4f03b0d)
+++ xsoft/other/fontforge.xml	(revision feb1a64938afdc507fb8a958ed879227affd5054)
@@ -96,13 +96,13 @@
       <xref linkend="libjpeg"/>,
       <xref linkend="libpng"/>,
+      <xref linkend="libtiff"/>,
+      <xref linkend="pango"/>,
+      <xref linkend="python2"/>,
       <ulink url="https://github.com/fontforge/libspiro">libspiro</ulink>,
-      <xref linkend="libtiff"/>,
       <ulink url="https://bitbucket.org/sortsmill/libunicodenames">
       libunicodenames</ulink>,
       <ulink url="https://github.com/fontforge/libuninameslist">
-      libuninameslist</ulink>,
+      libuninameslist</ulink>, and
       <ulink url="http://www.zeromq.org/">libzmq</ulink>,
-      <xref linkend="pango"/> and
-      <xref linkend="python2"/>
     </para>
 
