Index: general.ent
===================================================================
--- general.ent	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general.ent	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "25">                   <!-- Always 2 digits -->
+<!ENTITY day          "26">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS systemd Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 25th, &year;">
+<!ENTITY releasedate  "January 26th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "systemd">                  <!-- svn|[release #] -->
Index: general/genlib/boost.xml
===================================================================
--- general/genlib/boost.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/genlib/boost.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -94,6 +94,6 @@
     </para>
 
-<screen><userinput>sed -e 's@using python[^;]*@&: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VERSION}m} @'  \
-    -i bootstrap.sh</userinput></screen>
+<screen><userinput>sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VERSION}m} @' \
+-i bootstrap.sh</userinput></screen>
 
     <para>
Index: general/graphlib/aalib.xml
===================================================================
--- general/graphlib/aalib.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/aalib.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -33,5 +33,5 @@
     ASCII Art.</para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/graphlib/babl.xml
===================================================================
--- general/graphlib/babl.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/babl.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -6,10 +6,12 @@
 
   <!ENTITY babl-download-http
-           "http://download.gimp.org/pub/babl/0.1/babl-&babl-version;.tar.bz2">
-  <!ENTITY babl-download-ftp  " ">
-  <!ENTITY babl-md5sum        "50c8d12cdf5b3991590fa6cba16218a0">
-  <!ENTITY babl-size          "628 KB">
-  <!ENTITY babl-buildsize     "18 MB">
-  <!ENTITY babl-time          "0.2 SBU">
+  "http://download.gimp.org/pub/babl/0.1/babl-&babl-version;.tar.bz2">
+  <!ENTITY babl-download-ftp " ">
+<!--  <!ENTITY babl-download-ftp
+  "ftp://ftp.gimp.org/pub/babl/0.1/babl-&babl-version;.tar.bz2">-->
+  <!ENTITY babl-md5sum        "b64a3b2cef5b0bb62caff0afdd32bdb8">
+  <!ENTITY babl-size          "704 KB">
+  <!ENTITY babl-buildsize     "15 MB (with tests)">
+  <!ENTITY babl-time          "0.2 SBU (with tests)">
 ]>
 
@@ -36,5 +38,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76,7 +78,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="librsvg"/> and
-      <xref linkend="which"/>
+      <xref linkend="gobject-introspection"/>
     </para>
 
@@ -93,5 +93,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-docs &amp;&amp;
 make</userinput></screen>
 
@@ -105,5 +105,6 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -dm755 /usr/share/gtk-doc/html/babl/graphics &amp;&amp;
+
+install -v -m755 -d /usr/share/gtk-doc/html/babl/graphics &amp;&amp;
 install -v -m644 docs/*.{css,html} /usr/share/gtk-doc/html/babl &amp;&amp;
 install -v -m644 docs/graphics/*.{html,png,svg} /usr/share/gtk-doc/html/babl/graphics</userinput></screen>
@@ -114,12 +115,18 @@
 
     <para>
-      <command>install -v -dm755
+      <parameter>--disable-docs</parameter>: This switch disables
+      <filename>BablFishPath.html</filename> and
+      <filename>index.html</filename> generation. Remove it, if you want them.
+    </para>
+
+    <para>
+
+      <command>install -v -m755 -d
       /usr/share/gtk-doc/html/babl/graphics</command>: This and the subsequent
       commands install the library html documentation under
-      <filename class="directory">/usr/share/gtk-doc/html</filename> where other
-      <application>GTK+</application> packages put the programmer-oriented
-      documentation.
+      <filename class="directory">/usr/share/gtk-doc/html</filename> where
+      other gtk packages put the programmer-oriented documentation.
+
     </para>
-
   </sect2>
 
@@ -133,13 +140,8 @@
 
       <seglistitem>
+        <seg>None</seg>
+        <seg>libbabl-0.1.so and libraries in /usr/lib/babl-0.1</seg>
         <seg>
-          None
-        </seg>
-        <seg>
-          libbabl.so
-        </seg>
-        <seg>
-          /usr/include/babl-0.1,
-          /usr/lib/babl-0.1 and
+          /usr/{include,lib}/babl-0.1 and
           /usr/share/gtk-doc/html/babl
         </seg>
@@ -153,5 +155,5 @@
 
       <varlistentry id="libbabl">
-        <term><filename class="libraryfile">libbabl.so</filename></term>
+        <term><filename class='libraryfile'>libbabl-0.1.so</filename></term>
         <listitem>
           <para>
@@ -159,12 +161,9 @@
           </para>
           <indexterm zone="babl libbabl">
-            <primary sortas="c-libbabl">libbabl.so</primary>
+            <primary sortas="c-libbabl">libbabl-0.1.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>
Index: general/graphlib/exiv2.xml
===================================================================
--- general/graphlib/exiv2.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/exiv2.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/fontconfig.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY fontconfig-download-http 
+  <!ENTITY fontconfig-download-http
            "http://www.freedesktop.org/software/fontconfig/release/fontconfig-&fontconfig-version;.tar.bz2">
   <!ENTITY fontconfig-download-ftp  " ">
@@ -77,5 +77,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="freetype2"/> 
+      <xref linkend="freetype2"/>
     </para>
 
Index: general/graphlib/freetype2.xml
===================================================================
--- general/graphlib/freetype2.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/freetype2.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -6,14 +6,14 @@
 
   <!ENTITY freetype2-download-http "&sourceforge-repo;/freetype/freetype-&freetype2-version;.tar.bz2">
-  <!ENTITY freetype2-download-ftp  " ">
-  <!ENTITY freetype2-md5sum        "35cb8f4d9e5906847901bb39324c2f80">
+  <!ENTITY freetype2-download-ftp  "&gentoo-ftp-repo;/freetype-&freetype2-version;.tar.bz2">
+  <!ENTITY freetype2-md5sum        "86109d0c998787d81ac582bad9adf82e">
   <!ENTITY freetype2-size          "1.7 MB">
-  <!ENTITY freetype2-buildsize     "33 MB">
-  <!ENTITY freetype2-time          "0.2 SBU">
-
-  <!ENTITY freetype2-doc-version       "2.6">
+  <!ENTITY freetype2-buildsize     "34 MB (includes installing additional documentation)">
+  <!ENTITY freetype2-time          "0.2 SBU (includes installing additional documentation)">
+
+  <!ENTITY freetype2-doc-version   "2.6.2">
   <!ENTITY freetype2-doc-download-http "&sourceforge-repo;/freetype/freetype-doc-&freetype2-doc-version;.tar.bz2">
-  <!ENTITY freetype2-doc-download-ftp  " ">
-  <!ENTITY freetype2-doc-md5sum        "9a6f668a2bef1ac3f65c619af22a17bc">
+  <!ENTITY freetype2-doc-download-ftp  "&gentoo-ftp-repo;/freetype-doc-&freetype2-doc-version;.tar.bz2">
+  <!ENTITY freetype2-doc-md5sum        "22bd94ab15fc4b434e20161b866d7c3e">
   <!ENTITY freetype2-doc-size          "468 KB">
 ]>
@@ -51,9 +51,9 @@
         </para>
       </listitem>
-      <listitem>
+<!--      <listitem>
         <para>
           Download (FTP): <ulink url="&freetype2-download-ftp;"/>
         </para>
-      </listitem>
+      </listitem> -->
       <listitem>
         <para>
@@ -86,9 +86,9 @@
         </para>
       </listitem>
-      <listitem>
+<!--      <listitem>
         <para>
           Download (FTP): <ulink url="&freetype2-doc-download-ftp;"/>
         </para>
-      </listitem>
+      </listitem> -->
       <listitem>
         <para>
@@ -104,5 +104,5 @@
 
     <bridgehead renderas="sect3">FreeType2 Dependencies</bridgehead>
- 
+
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
@@ -134,10 +134,10 @@
     </para>
 
-<screen><userinput>sed -i  -e "/AUX.*.gxvalid/s@^# @@" \
-        -e "/AUX.*.otvalid/s@^# @@" \
-        modules.cfg                        &amp;&amp;
-
-sed -ri -e 's:.*(#.*SUBPIXEL.*) .*:\1:' \
-        include/freetype/config/ftoption.h          &amp;&amp;
+<screen><userinput>sed -e "/AUX.*.gxvalid/s@^# @@" \
+    -e "/AUX.*.otvalid/s@^# @@" \
+    -i modules.cfg              &amp;&amp;
+
+sed -e 's:.*\(#.*SUBPIXEL.*\) .*:\1:' \
+    -i include/freetype/config/ftoption.h  &amp;&amp;
 
 ./configure --prefix=/usr --disable-static &amp;&amp;
@@ -165,5 +165,5 @@
       table validation and second command enables Subpixel Rendering and
       Subpixel Hinting in order to improve font rendering. Note that Subpixel
-      Rendering may have patent issues. Be sure to read the <literal>'Other
+      Rendering may have patent issues.  Be sure to read the <literal>'Other
       patent issues'</literal> part of
       <ulink url="http://www.freetype.org/patents.html"/>
Index: general/graphlib/fribidi.xml
===================================================================
--- general/graphlib/fribidi.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/fribidi.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -7,8 +7,8 @@
   <!ENTITY fribidi-download-http "http://fribidi.org/download/fribidi-&fribidi-version;.tar.bz2">
   <!ENTITY fribidi-download-ftp  " ">
-  <!ENTITY fribidi-md5sum        "ce93d862344991173dabb609bf93ca1d">
-  <!ENTITY fribidi-size          "625 KB">
-  <!ENTITY fribidi-buildsize     "6.5 MB">
-  <!ENTITY fribidi-time          "0.1 SBU">
+  <!ENTITY fribidi-md5sum        "6c7e7cfdd39c908f7ac619351c1c5c23">
+  <!ENTITY fribidi-size          "636 KB">
+  <!ENTITY fribidi-buildsize     "6.7 MB (with tests)">
+  <!ENTITY fribidi-time          "less than 0.1 SBU (with tests)">
 ]>
 
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -93,8 +93,6 @@
     </para>
 
-<screen><userinput>sed -i "s|glib/gstrfuncs\.h|glib.h|" charset/fribidi-char-sets.c &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 
-sed -i "s|glib/gmem\.h|glib.h|"      lib/mem.h                   &amp;&amp;
-./configure --prefix=/usr                                        &amp;&amp;
 make</userinput></screen>
 
@@ -109,5 +107,5 @@
 <screen role="root"><userinput>make install</userinput></screen>
   </sect2>
-
+<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
@@ -116,5 +114,5 @@
     <application>GLib-2</application> is linked into the build.</para>
 
-  </sect2>
+  </sect2>-->
 
   <sect2 role="content">
Index: general/graphlib/gegl.xml
===================================================================
--- general/graphlib/gegl.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/gegl.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -7,4 +7,5 @@
   <!ENTITY gegl-download-http "http://download.gimp.org/pub/gegl/0.2/gegl-&gegl-version;.tar.bz2">
   <!ENTITY gegl-download-ftp " ">
+<!--  <!ENTITY gegl-download-ftp "ftp://ftp.gimp.org/pub/gegl/0.2/gegl-&gegl-version;.tar.bz2">-->
   <!ENTITY gegl-md5sum        "32b00002f1f1e316115c4ed922e1dec8">
   <!ENTITY gegl-size          "7.2 MB">
@@ -35,5 +36,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -82,4 +83,5 @@
 
     <bridgehead renderas="sect3">gegl Dependencies</bridgehead>
+
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -142,5 +144,5 @@
 <screen role="root"><userinput>make install &amp;&amp;
 install -v -m644 docs/*.{css,html} /usr/share/gtk-doc/html/gegl &amp;&amp;
-install -v -dm755 /usr/share/gtk-doc/html/gegl/images &amp;&amp;
+install -d -v -m755 /usr/share/gtk-doc/html/gegl/images &amp;&amp;
 install -v -m644 docs/images/* /usr/share/gtk-doc/html/gegl/images</userinput></screen>
   </sect2>
@@ -156,11 +158,17 @@
     </para>
 
+    <para>
+      <option>--without-vala</option>: Do not create a
+      <application>vala</application> API - use this if
+      <command>vapigen</command> breaks the build.
+    </para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
     <para>
-      <envar>LC_ALL=en_US</envar>: In some locales with <xref linkend="ruby"/>
+      <envar>LC_ALL=en_US</envar>: In some locales with <xref linkend='ruby'/>
       installed, one build component fails and prevents completion of the
-      procedure. Using this variable avoids the problem.
+      procedure.  Using this variable avoids the problem.
     </para>
 
@@ -176,13 +184,7 @@
 
       <seglistitem>
-        <seg>
-          gegl
-        </seg>
-        <seg>
-          libgegl-0.2.so
-        </seg>
-        <seg>
-          /usr/include/gegl-0.2
-        </seg>
+        <seg>gegl</seg>
+        <seg>libgegl-0.2.so and libraries in /usr/lib/gegl-0.2</seg>
+        <seg>/usr/include/gegl-0.2</seg>
       </seglistitem>
     </segmentedlist>
@@ -206,5 +208,5 @@
 
       <varlistentry id="libgegl-0.2">
-        <term><filename class="libraryfile">libgegl-0.2.so</filename></term>
+        <term><filename class='libraryfile'>libgegl-0.2.so</filename></term>
         <listitem>
           <para>
@@ -217,8 +219,5 @@
         </listitem>
       </varlistentry>
-
     </variablelist>
-
-  </sect2>
-
+  </sect2>
 </sect1>
Index: general/graphlib/giflib.xml
===================================================================
--- general/graphlib/giflib.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/giflib.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -7,8 +7,8 @@
   <!ENTITY giflib-download-http "&sourceforge-repo;/giflib/giflib-&giflib-version;.tar.bz2">
   <!ENTITY giflib-download-ftp  " ">
-  <!ENTITY giflib-http-md5sum   "1c39333192712788c6568c78a949f13e">
-  <!ENTITY giflib-http-size     "640 KB">
-  <!ENTITY giflib-buildsize     "6.7 MB (with documentation; additional 0.4 MB for the tests)">
-  <!ENTITY giflib-time          "0.1 SBU (with documentation)">
+  <!ENTITY giflib-http-md5sum   "323a9f11ab56c8a2d1715376410ce376">
+  <!ENTITY giflib-http-size     "624 KB">
+  <!ENTITY giflib-buildsize     "7.6 MB (with documentation and tests)">
+  <!ENTITY giflib-time          "0.1 SBU (with documentation and tests)">
 ]>
 
@@ -34,5 +34,5 @@
     working with GIF files.</para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76,6 +76,6 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. Test suite
-    results are kept in <filename>test.sh.log</filename>.</para>
+    <para>To test the results, issue: <command>make check-TESTS</command>. Test
+    suite results are kept in <filename>test.sh.log</filename>.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
Index: general/graphlib/graphite2.xml
===================================================================
--- general/graphlib/graphite2.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/graphite2.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -11,8 +11,8 @@
            "&sourceforge-repo;/silgraphite/graphite2-&graphite2-version;.tgz">
   <!ENTITY graphite2-download-ftp  " ">
-  <!ENTITY graphite2-md5sum        "7cda6fc6bc197b216777b15ce52c38a8">
-  <!ENTITY graphite2-size          "6.5 MB">
-  <!ENTITY graphite2-buildsize     "48 MB">
-  <!ENTITY graphite2-time          "0.3 SBU">
+  <!ENTITY graphite2-md5sum        "5b8d22a8bbf031838e31432868c0109c">
+  <!ENTITY graphite2-size          "3.8 MB">
+  <!ENTITY graphite2-buildsize     "27 MB (with docs and tests)">
+  <!ENTITY graphite2-time          "0.3 SBU (with docs and tests)">
 ]>
 
@@ -101,9 +101,16 @@
       <application>harfbuzz</application>).
     </para>
-    <para>To build the documentation, which is reported to be broken, would
-      require all of
+
+    <para>To build the documentation:
       <ulink url="http://www.methods.co.nz/asciidoc/">AsciiDoc</ulink>,
-      <xref linkend="doxygen"/> and
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
+      <xref linkend="doxygen"/>,
+      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>), and
+      <ulink url="http://dblatex.sourceforge.net/">
+      dblatex</ulink>  (for PDF docs)
+    </para>
+
+    <para>To execute the test suite you will need
+      <ulink url="https://pypi.python.org/pypi/FontTools">FontTools</ulink>
+      (Python 2 module), otherwise, the "cmp" tests fail.
     </para>
 
@@ -131,12 +138,26 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=/usr \ 
-      -DCMAKE_BUILD_TYPE=Release  \
-      -Wno-dev                    .. &amp;&amp;
+cmake -G "Unix Makefiles"         \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      .. &amp;&amp;
+
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make -k test</command>. Several
-      tests fail for unknown reasons.
+      If you wish to build the documentation, issue:
+    </para>
+
+<screen><userinput>make docs</userinput></screen>
+
+    <para>
+      Some tests fail if
+      <ulink url="https://pypi.python.org/pypi/FontTools">FontTools</ulink>
+      (Python 2 module) is not installed. These tests can be removed with:
+    </para>
+
+<screen><userinput>sed -i '/cmptest/d' tests/CMakeLists.txt</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make test</command>.
     </para>
 
@@ -146,4 +167,24 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      If you built the documentation, install, as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -d -m755 /usr/share/doc/graphite2-&graphite2-version;/api &amp;&amp;
+cp      -v -r -f    doc/doxygen/{html,latex/refman.pdf} \
+                    /usr/share/doc/graphite2-&graphite2-version;/api &amp;&amp;
+cp      -v -r -f    doc/{GTF,manual}.html \
+                    /usr/share/doc/graphite2-&graphite2-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><option>-DCMAKE_VERBOSE_MAKEFILE=ON</option>: This switch turns on
+    build verbose mode.</para>
+
   </sect2>
 
@@ -164,6 +205,6 @@
         </seg>
         <seg>
-          /usr/include/graphite2 and
-          /usr/share/graphite2
+          /usr/{include,share}/graphite2 and optionally
+          /usr/share/doc/graphite2-&graphite2-version;
         </seg>
       </seglistitem>
Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/graphlib.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -44,8 +44,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwebp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="newt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opencv.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjpeg.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjpeg2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pixman.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qpdf.xml"/>
 
Index: general/graphlib/harfbuzz.xml
===================================================================
--- general/graphlib/harfbuzz.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/harfbuzz.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -8,8 +8,8 @@
            "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-&harfbuzz-version;.tar.bz2">
   <!ENTITY harfbuzz-download-ftp  " ">
-  <!ENTITY harfbuzz-md5sum        "1223cefac2bc77298ff5c7422bb148d5">
-  <!ENTITY harfbuzz-size          "1.2 MB">
-  <!ENTITY harfbuzz-buildsize     "53 MB (with test suite)">
-  <!ENTITY harfbuzz-time          "0.5 SBU (with test suite)">
+  <!ENTITY harfbuzz-md5sum        "671daf05153d57258e5cb992aa28c64a">
+  <!ENTITY harfbuzz-size          "1.3 MB">
+  <!ENTITY harfbuzz-buildsize     "53 MB (with tests)">
+  <!ENTITY harfbuzz-time          "0.4 SBU (with tests)">
 ]>
 
@@ -157,16 +157,12 @@
       <seglistitem>
         <seg>
-          hb-ot-shape-closure, 
-          hb-shape, and
-          hb-view (only if Cairo is installed)
+          hb-ot-shape-closure, hb-shape, and
+          hb-view (only if cairo is installed)
         </seg>
         <seg>
-          libharfbuzz.so, 
-          libharfbuzz-gobject.so, 
-          and libharfbuzz-icu.so
+          libharfbuzz.so, libharfbuzz-gobject.so and libharfbuzz-icu.so
         </seg>
         <seg>
-          /usr/include/harfbuzz and
-          /usr/share/gtk-doc/html/harfbuzz
+          /usr/{include,share/gtk-doc/html}/harfbuzz
         </seg>
       </seglistitem>
@@ -178,5 +174,5 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="hb-ot-shape-closure">
+     <varlistentry id="hb-ot-shape-closure">
         <term><command>hb-ot-shape-closure</command></term>
         <listitem>
Index: general/graphlib/ijs.xml
===================================================================
--- general/graphlib/ijs.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/ijs.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/graphlib/lcms.xml
===================================================================
--- general/graphlib/lcms.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/lcms.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -33,5 +33,5 @@
     programs to provide color management facilities.</para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -96,7 +96,7 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -dm755 /usr/share/doc/lcms-&lcms-version; &amp;&amp;
-install -v -m644  README.1ST doc/* \
-                  /usr/share/doc/lcms-&lcms-version;</userinput></screen>
+install -v -m755 -d /usr/share/doc/lcms-&lcms-version; &amp;&amp;
+install -v -m644    README.1ST doc/* \
+                    /usr/share/doc/lcms-&lcms-version;</userinput></screen>
 
   </sect2>
Index: general/graphlib/lcms2.xml
===================================================================
--- general/graphlib/lcms2.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/lcms2.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -9,6 +9,6 @@
   <!ENTITY lcms2-md5sum        "06c1626f625424a811fb4b5eb070839d">
   <!ENTITY lcms2-size          "6.2 MB">
-  <!ENTITY lcms2-buildsize     "21 MB">
-  <!ENTITY lcms2-time          "0.2 SBU">
+  <!ENTITY lcms2-buildsize     "21 MB (with the tests)">
+  <!ENTITY lcms2-time          "0.2 SBU (with the tests)">
 ]>
 
@@ -35,5 +35,5 @@
     standard for color management.</para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/graphlib/libexif.xml
===================================================================
--- general/graphlib/libexif.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/libexif.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -95,7 +95,7 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --with-doc-dir=/usr/share/doc/libexif-&libexif-version; &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --with-doc-dir=/usr/share/doc/libexif-&libexif-version; \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
Index: general/graphlib/libjpeg-turbo.xml
===================================================================
--- general/graphlib/libjpeg-turbo.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/libjpeg-turbo.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -9,6 +9,6 @@
   <!ENTITY libjpeg-md5sum        "86b0d5f7507c2e6c21c00219162c3c44">
   <!ENTITY libjpeg-size          "1.5 MB">
-  <!ENTITY libjpeg-buildsize     "16 MB">
-  <!ENTITY libjpeg-time          "0.6 SBU">
+  <!ENTITY libjpeg-buildsize     "15 MB">
+  <!ENTITY libjpeg-time          "0.4 SBU">
 ]>
 
@@ -105,4 +105,14 @@
       To test the results, issue: <command>make test</command>.
     </para>
+
+    <note><para>
+      If installing <application>libjpeg-turbo</application> over an older jpeg
+      installation, not all library symbolic links are updated properly.  To fix
+      this before installation, run the following as the <systemitem
+      class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>rm -f /usr/lib/libjpeg.so*</userinput></screen>
+
+    </note>
 
     <para>
Index: neral/graphlib/libmediaart-systemd.xml
===================================================================
--- general/graphlib/libmediaart-systemd.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ 	(revision )
@@ -1,175 +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 libmediaart-download-http "&gnome-download-http;/libmediaart/0.7/libmediaart-&libmediaart-version;.tar.xz">
-  <!ENTITY libmediaart-download-ftp  "&gnome-download-ftp;/libmediaart/0.7/libmediaart-&libmediaart-version;.tar.xz">
-  <!ENTITY libmediaart-md5sum        "1a44933d4cd0064e3c76d8d0ddacddc9">
-  <!ENTITY libmediaart-size          "5.5 MB">
-  <!ENTITY libmediaart-buildsize     "9.8 MB">
-  <!ENTITY libmediaart-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libmediaart" xreflabel="libmediaart-&libmediaart-version;">
-  <?dbhtml filename="libmediaart.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libmediaart-&libmediaart-version;</title>
-
-  <indexterm zone="libmediaart">
-    <primary sortas="a-libmediaart">libmediaart</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libmediaart</title>
-
-    <para>
-      The <application>libmediaart</application> package contains a media
-      art extraction and cache management library.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmediaart-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmediaart-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmediaart-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmediaart-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmediaart-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmediaart-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libmediaart Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gdk-pixbuf"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="qt4"/>, and
-      <xref linkend="qt5"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libmediaart"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libmediaart</title>
-
-    <para>
-      Install <application>libmediaart</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make 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="commands">
-
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libmediaart-1.0.so
-        </seg>
-        <seg>
-          /usr/include/libmediaart-1.0 and
-          /usr/share/gtk-doc/html/libmediaart
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libmediaart-1.0">
-        <term><filename class="libraryfile">libmediaart-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for media art extraction and cache
-            management.
-          </para>
-          <indexterm zone="libmediaart libmediaart-1.0">
-            <primary sortas="c-libmediaart-1.0">libmediaart-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/libmediaart.xml
===================================================================
--- general/graphlib/libmediaart.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
+++ general/graphlib/libmediaart.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -0,0 +1,175 @@
+<?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 libmediaart-download-http "&gnome-download-http;/libmediaart/0.7/libmediaart-&libmediaart-version;.tar.xz">
+  <!ENTITY libmediaart-download-ftp  "&gnome-download-ftp;/libmediaart/0.7/libmediaart-&libmediaart-version;.tar.xz">
+  <!ENTITY libmediaart-md5sum        "1a44933d4cd0064e3c76d8d0ddacddc9">
+  <!ENTITY libmediaart-size          "5.5 MB">
+  <!ENTITY libmediaart-buildsize     "9.8 MB">
+  <!ENTITY libmediaart-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="libmediaart" xreflabel="libmediaart-&libmediaart-version;">
+  <?dbhtml filename="libmediaart.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libmediaart-&libmediaart-version;</title>
+
+  <indexterm zone="libmediaart">
+    <primary sortas="a-libmediaart">libmediaart</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libmediaart</title>
+
+    <para>
+      The <application>libmediaart</application> package contains a media
+      art extraction and cache management library.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libmediaart-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libmediaart-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libmediaart-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libmediaart-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libmediaart-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libmediaart-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libmediaart Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gdk-pixbuf"/>, and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="qt4"/>, and
+      <xref linkend="qt5"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libmediaart"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libmediaart</title>
+
+    <para>
+      Install <application>libmediaart</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make 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="commands">
+
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libmediaart-1.0.so
+        </seg>
+        <seg>
+          /usr/include/libmediaart-1.0 and
+          /usr/share/gtk-doc/html/libmediaart
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libmediaart-1.0">
+        <term><filename class="libraryfile">libmediaart-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for media art extraction and cache
+            management.
+          </para>
+          <indexterm zone="libmediaart libmediaart-1.0">
+            <primary sortas="c-libmediaart-1.0">libmediaart-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/graphlib/libmng.xml
===================================================================
--- general/graphlib/libmng.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/libmng.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -34,5 +34,5 @@
     (MNG) files which are the animation equivalents to PNG files.</para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -86,5 +86,5 @@
 <screen role="root"><userinput>make install &amp;&amp;
 
-install -v -dm755          /usr/share/doc/libmng-&libmng-version; &amp;&amp;
+install -v -m755 -d        /usr/share/doc/libmng-&libmng-version; &amp;&amp;
 install -v -m644 doc/*.txt /usr/share/doc/libmng-&libmng-version;</userinput></screen>
 
Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/libpng.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -7,13 +7,15 @@
   <!ENTITY libpng-download-http "&sourceforge-repo;/libpng/libpng-&libpng-version;.tar.xz">
   <!ENTITY libpng-download-ftp  " ">
-  <!ENTITY libpng-md5sum        "1e6a458429e850fc93c1f3b6dc00a48f">
-  <!ENTITY libpng-size          "920 KB">
-  <!ENTITY libpng-buildsize     "15 MB">
-  <!ENTITY libpng-time          "0.9 SBU (with the test suite)">
-
-  <!ENTITY apng-version "1.6.19">
-
+  <!ENTITY libpng-md5sum        "3bacb4728f6694a64ad9052769d6a4ce">
+  <!ENTITY libpng-size          "924 KB">
+  <!ENTITY libpng-buildsize     "16 MB (with tests)">
+  <!ENTITY libpng-time          "0.6 SBU (with tests)">
+
+  <!ENTITY apng-version "&libpng-version;">
+
+  <!--<!ENTITY apng-patch
+           "&sourceforge-repo;/libpng-apng/libpng-&apng-version;-apng.patch.gz">-->
   <!ENTITY apng-patch
-           "&sourceforge-repo;/libpng-apng/libpng-&apng-version;-apng.patch.gz">
+           "&sourceforge-repo;/project/apng/libpng/libpng16/libpng-&apng-version;-apng.patch.gz">
 ]>
 
@@ -85,5 +87,7 @@
           <application>libpng</application> (required to use the system
           <application>libpng</application> in
-          <application>Firefox</application>): <ulink url="&apng-patch;"/>
+          <application>Firefox</application>),
+          <application>Seamonkey</application>), and
+          <application>Thunderbird</application>): <ulink url="&apng-patch;"/>
         </para>
       </listitem>
@@ -102,5 +106,6 @@
     </para>
 
-<screen><userinput>gzip -cd ../libpng-&apng-version;-apng.patch.gz | patch -p1</userinput></screen>
+<!--<screen><userinput>gzip -cd ../libpng-&apng-version;-apng.patch.gz | patch -p1</userinput></screen>-->
+<screen><userinput>gzip -cd ../libpng-&apng-version;-apng.patch.gz | patch -p0</userinput></screen>
 
     <para>
@@ -144,12 +149,8 @@
       <seglistitem>
         <seg>
-          libpng-config (symlink), 
-          libpng16-config, 
-          pngfix, 
-          and png-fix-itxt
+          libpng-config (symlink), libpng16-config, pngfix and png-fix-itxt
         </seg>
         <seg>
-          libpng.so and 
-          libpng16.so
+          libpng.so
         </seg>
         <seg>
Index: general/graphlib/libraw.xml
===================================================================
--- general/graphlib/libraw.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/libraw.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -7,7 +7,7 @@
   <!ENTITY libraw-download-http "http://www.libraw.org/data/LibRaw-&libraw-version;.tar.gz">
   <!ENTITY libraw-download-ftp  " ">
-  <!ENTITY libraw-md5sum        "6e5d0998b2904f3787c296777293af58">
-  <!ENTITY libraw-size          "1.4 MB">
-  <!ENTITY libraw-buildsize     "16 MB">
+  <!ENTITY libraw-md5sum        "b56ace01e64aba9cda4f9e7f2821449d">
+  <!ENTITY libraw-size          "1.5 MB">
+  <!ENTITY libraw-buildsize     "18 MB">
   <!ENTITY libraw-time          "0.2 SBU">
 ]>
@@ -32,8 +32,8 @@
     <para>
       <application>Libraw</application> is a library for reading RAW files
-      obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others). 
-    </para>
-
-    &lfs77_checked;
+      obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others).
+    </para>
+
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -75,5 +75,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="libjpeg"/>, 
+      <xref linkend="libjpeg"/>,
       <xref linkend="jasper"/>, and
       <xref linkend="lcms2"/>
@@ -108,5 +108,5 @@
 
     <para>
-      This package does not come with a test suite. 
+      This package does not come with a test suite.
     </para>
 
@@ -127,5 +127,5 @@
       <xref linkend="libjpeg"/> installed.
     </para>
-  
+
     <para>
       <option>--enable-jasper</option>: This switch enables
@@ -133,5 +133,5 @@
       <xref linkend="jasper"/> installed.
     </para>
-  
+
     <para>
       <option>--enable-lcms</option>: This switch enables
@@ -139,5 +139,5 @@
       <xref linkend="lcms2"/> installed.
     </para>
-  
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
@@ -154,18 +154,4 @@
       </note>
 
-      <note>
-         <para>
-           All the installed programs are samples of the libraw using.
-         </para>
-      </note>
-
-
-      <note>
-         <para>
-           All the installed programs are samples of the libraw using.
-         </para>
-      </note>
-
-
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
@@ -175,7 +161,7 @@
       <seglistitem>
         <seg>
-          4channels, dcraw_half, mem_image, postprocessing_benchmark, 
-          simple_dcraw, dcraw_emu, half_mt, multirender_test, raw-identify,
-          and unprocessed_raw
+          4channels, dcraw_emu, dcraw_half, half_mt, mem_image,
+          multirender_test, postprocessing_benchmark, raw-identify,
+          simple_dcraw, and unprocessed_raw
         </seg>
         <seg>
@@ -330,6 +316,6 @@
       </varlistentry>
 
-      <varlistentry id="libraw-lib">
-        <term><filename class="libraryfile">libraw.so</filename></term>
+<!--      <varlistentry id="libraw-lib">
+        <term><filename class='libraryfile'>libraw.so</filename></term>
         <listitem>
           <para>
@@ -341,5 +327,5 @@
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry> -->
 
     </variablelist>
Index: general/graphlib/librsvg.xml
===================================================================
--- general/graphlib/librsvg.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/librsvg.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -7,8 +7,8 @@
   <!ENTITY librsvg-download-http "&gnome-download-http;/librsvg/2.40/librsvg-&librsvg-version;.tar.xz">
   <!ENTITY librsvg-download-ftp  "&gnome-download-ftp;/librsvg/2.40/librsvg-&librsvg-version;.tar.xz">
-  <!ENTITY librsvg-md5sum        "fadebe2e799ab159169ee3198415ff85">
-  <!ENTITY librsvg-size          "512 KB">
-  <!ENTITY librsvg-buildsize     "11 MB">
-  <!ENTITY librsvg-time          "0.2 SBU">
+  <!ENTITY librsvg-md5sum        "ad03780e12c56e52474d8edf86976c73">
+  <!ENTITY librsvg-size          "540 KB">
+  <!ENTITY librsvg-buildsize     "14 MB (with tests)">
+  <!ENTITY librsvg-time          "0.2 SBU (with tests)">
 ]>
 
@@ -127,6 +127,6 @@
     <para>
       <parameter>--enable-vala</parameter>: This switch enables
-      building of the Vala bindings. Remove this switch if you
-      don't have <xref linkend="vala"/> installed.
+      building of the Vala bindings. Remove this switch if you don't have
+      <xref linkend="vala"/> installed.
     </para>
 
@@ -136,5 +136,5 @@
     <para>
       <option>--disable-introspection</option>: Use this switch if you have
-      not installed <xref linkend="gobject-introspection"/>.
+      not installed <application>Gobject Introspection</application>.
     </para>
 
Index: general/graphlib/libtiff.xml
===================================================================
--- general/graphlib/libtiff.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/libtiff.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -11,5 +11,5 @@
   <!ENTITY libtiff-md5sum        "d1d2e940dea0b5ad435f21f03d96dd72">
   <!ENTITY libtiff-size          "2.1 MB">
-  <!ENTITY libtiff-buildsize     "26 MB">
+  <!ENTITY libtiff-buildsize     "25 MB">
   <!ENTITY libtiff-time          "0.4 SBU">
 ]>
@@ -88,5 +88,5 @@
     <para role="optional">
       <xref linkend="freeglut"/> (required for <command>tiffgt</command>),
-      <xref linkend="libjpeg"/> (required for the tests), and
+      <xref linkend="libjpeg"/> and
       <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>
     </para>
Index: general/graphlib/libwebp.xml
===================================================================
--- general/graphlib/libwebp.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/libwebp.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -7,8 +7,8 @@
   <!ENTITY libwebp-download-http "http://downloads.webmproject.org/releases/webp/libwebp-&libwebp-version;.tar.gz">
   <!ENTITY libwebp-download-ftp  " ">
-  <!ENTITY libwebp-md5sum        "08813525eeeffe7e305b4cbfade8ae9b">
-  <!ENTITY libwebp-size          "968 KB">
-  <!ENTITY libwebp-buildsize     "28 MB">
-  <!ENTITY libwebp-time          "0.3 SBU">
+  <!ENTITY libwebp-md5sum        "ba81eb9bf23e3c69a2f5cc8dcdb5938f">
+  <!ENTITY libwebp-size          "1.1 MB">
+  <!ENTITY libwebp-buildsize     "32 MB">
+  <!ENTITY libwebp-time          "0.2 SBU">
 ]>
 
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -99,10 +99,19 @@
     </para>
 
+    <note>
+      <para>
+        If you are updating from libwebp-0.4.x, and wish that installed
+        applications link to the new version 0.5.x, they need to be reinstalled.
+      </para>
+    </note>
+
 <screen><userinput>./configure --prefix=/usr           \
-            --disable-static        \
-            --enable-experimental   \
+            --enable-libwebpmux     \
+            --enable-libwebpdemux   \
             --enable-libwebpdecoder \
-            --enable-libwebpdemux   \
-            --enable-libwebpmux     &amp;&amp;
+            --enable-libwebpextras  \
+            --enable-swap-16bit-csp \
+            --disable-static        &amp;&amp;
+
 make</userinput></screen>
 
@@ -122,21 +131,13 @@
     <title>Command Explanations</title>
 
+
+    <para>
+      <parameter>--enable-swap-16bit-csp</parameter>: This switch enables byte
+      swap for 16 bit colorspaces.
+    </para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
 
-    <para>
-      <parameter>--enable-experimental</parameter>: This switch enables
-      building of the experimental features which may be needed
-      by other programs in BLFS and beyond.
-    </para>
-
-    <para>
-      <parameter>--enable-libwebp*</parameter>: This switch enables
-      building of the additional <application>libwebp</application>
-      libraries which are required to build additional programs
-      from <application>libwebp</application> source and may be
-      needed by other programs in BLFS and beyond.
-    </para>
-
   </sect2>
 
@@ -146,14 +147,14 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>
-          cwebp, dwebp, gif2webp, vwebp and webpmux
+          cwebp, dwebp, gif2webp, vwebp, and webpmux
         </seg>
         <seg>
-          libwebpdecoder.so, libwebpdemux.so, libwebpmux.so and
-          libwebp.so
+          libwebpdecoder.so, libwebpdemux.so, libwebpextras.so,
+          libwebpmux.so, and libwebp.so
         </seg>
         <seg>
@@ -208,6 +209,5 @@
         <listitem>
           <para>
-            decompresses a WebP file and displays it in a window
-            using OpenGL.
+            decompress a WebP file and display it in a window.
           </para>
           <indexterm zone="libwebp vwebp">
@@ -221,6 +221,7 @@
         <listitem>
           <para>
-            used to create a WebP container file and extract/strip
-            relevant data from the container file.
+            creates animated WebP files from non-animated WebP images, extracts
+            frames from animated WebP images, and manages XMP/EXIF metadata and
+            ICC profile.
           </para>
           <indexterm zone="libwebp webpmux">
@@ -234,5 +235,5 @@
         <listitem>
           <para>
-            contains API functions for encoding and decoding WebP Images.
+            contains the API functions for WebP encoding and decoding.
           </para>
           <indexterm zone="libwebp libwebp-lib">
Index: general/graphlib/newt.xml
===================================================================
--- general/graphlib/newt.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/newt.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -35,8 +35,8 @@
       windows, entry widgets, checkboxes, radio buttons, labels, plain text
       fields, scrollbars, etc., to text mode user interfaces.
-      <application>Newt</application> is based on the S-Lang library. 
+      <application>Newt</application> is based on the S-Lang library.
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -115,5 +115,5 @@
 
     <para>
-      This package does not come with a test suite. 
+      This package does not come with a test suite.
     </para>
 
@@ -130,6 +130,6 @@
 
     <para>
-      <command>sed -e ... -i Makefile.in</command>: This command prevents a
-      static library from being installed.
+      <command>sed -e ... -i Makefile.in</command>: Disables installation of an
+      static library.
     </para>
 
@@ -146,5 +146,5 @@
       <seglistitem>
         <seg> whiptail </seg>
-        <seg> libnewt.so, whiptcl.so, and 
+        <seg> libnewt.so, whiptcl.so, and
         /usr/lib/python{&python2-majorver;,&python3-majorver;}/site-packages/_snack.so </seg>
         <seg> None </seg>
Index: general/graphlib/opencv.xml
===================================================================
--- general/graphlib/opencv.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
+++ general/graphlib/opencv.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -0,0 +1,252 @@
+<?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 cvdir "/projects/opencvlibrary/files">
+
+  <!ENTITY opencv-download-http "&sourceforge-repo2;&cvdir;/opencv-unix/&opencv-version;/opencv-&opencv-version;.zip">
+  <!ENTITY opencv-download-ftp    " ">
+  <!ENTITY opencv-md5sum          "6082ee2124d4066581a7386972bfd52a">
+  <!ENTITY opencv-size            "76 MB">
+  <!ENTITY opencv-buildsize       "1.8 GB">
+  <!ENTITY opencv-time            "4.9 SBU">
+
+  <!ENTITY ippicv-version         "20151201">
+  <!ENTITY ippicv_binaries_commit "81a676001ca8075ada498583e4166079e5744668">
+
+]>
+
+<sect1 id="opencv" xreflabel="opencv-&opencv-version;">
+  <?dbhtml filename="opencv.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>opencv-&opencv-version;</title>
+
+  <indexterm zone="opencv">
+    <primary sortas="a-opencv">opencv</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to opencv</title>
+
+    <para>
+      The <application>opencv</application> package contains graphics libraries
+      mainly aimed at real-time computer vision.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&opencv-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&opencv-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &opencv-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &opencv-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &opencv-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &opencv-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <para>Optional file: <ulink
+      url="https://raw.githubusercontent.com/Itseez/opencv_3rdparty/&ippicv_binaries_commit;/ippicv/ippicv_linux_&ippicv-version;.tgz">
+           https://raw.githubusercontent.com/Itseez/opencv_3rdparty/&ippicv_binaries_commit;/ippicv/ippicv_linux_&ippicv-version;.tgz</ulink>
+    </para>
+
+    <bridgehead renderas="sect3">opencv Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/> and
+      <xref linkend="unzip"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="ffmpeg"/>,
+      <xref linkend="gst10-plugins-base"/>,
+      <xref linkend="gtk3"/>,
+      <xref linkend="jasper"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libpng"/>,
+      <xref linkend="libtiff"/>,
+      <xref linkend="libwebp"/>,
+      <xref linkend="python2"/>,
+      <xref linkend="v4l-utils"/>, and
+      <xref linkend="xine-lib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="apache-ant"/>,
+      <xref linkend="doxygen"/>,
+      <xref linkend="java"/>,
+      <xref linkend="python3"/>,
+      <ulink url="https://developer.nvidia.com/cuda-zone">Cuda</ulink>,
+      <ulink url="http://eigen.tuxfamily.org/">Eigen</ulink>,
+      <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
+      <ulink url="http://gcd.joewheaton.org/">GCD</ulink>,
+      <ulink url="http://www.gdal.org/">GDAL</ulink>,
+      <ulink url="http://www.jai.com/en/support/gigevisionsdkcontroltoolv130">GigEVisionSDK</ulink>,
+      <ulink url="http://jackaudio.org/">JACK</ulink>,
+      <ulink url="http://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
+      <ulink url="http://www.gphoto.org/">libgphoto2</ulink>,
+      <ulink url="http://www.numpy.org/">NumPy</ulink>,
+      <ulink url="http://structure.io/openni">OpenNI</ulink>,
+      <ulink url="http://plantuml.sourceforge.net/">PlanetUML</ulink>,
+      <ulink url="http://www.1stvision.com/AVT-gige-camera-software-downloads.html">PvAPI</ulink>,
+      <ulink url="https://www.threadingbuildingblocks.org/">Threading Building Blocks (TBB)</ulink>,
+      <ulink url="http://unicap-imaging.org/">UniCap</ulink>,
+      <ulink url="http://www.vtk.org/">VTK - The Visualization Toolkit</ulink>, and
+      <ulink url="http://www.ximea.com/">XIMEA</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/opencv"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of opencv</title>
+
+    <para>
+      If the optional Integrated Performance Primitives (IPP) package has been
+      downloaded, put it in place so the cmake script does not try to download
+      it again:
+    </para>
+
+<screen><userinput>ipp_file=../ippicv_linux_&ippicv-version;.tgz             &amp;&amp;
+ipp_hash=$(md5sum $ipp_file | cut -d" " -f1)      &amp;&amp;
+ipp_dir=3rdparty/ippicv/downloads/linux-$ipp_hash &amp;&amp;
+
+mkdir -p $ipp_dir &amp;&amp;
+cp $ipp_file $ipp_dir</userinput></screen>
+
+    <para>
+      Install <application>opencv</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DWITH_XINE=ON              \
+      -DBUILD_TESTS=OFF           \
+      -Wno-dev  ..
+make</userinput></screen>
+
+    <para>
+      The package does not come with an operable test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>-DWITH_XINE=ON</parameter>: This option instructs the make
+    procedure to use <xref linkend="xine-lib"/>.</para>
+
+    <para><parameter>-DWITH_IPP=ON</parameter>: This option instructs the make
+    procedure to use the downloaded IPP package.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          opencv_annotation,
+          opencv_createsamples, and
+          opencv_traincascade
+        </seg>
+        <seg>
+          libopencv_calib3d.so,
+          libopencv_core.so,
+          libopencv_features2d.so,
+          libopencv_flann.so,
+          libopencv_highgui.so,
+          libopencv_imgcodecs.so,
+          libopencv_imgproc.so,
+          libopencv_ml.so,
+          libopencv_objdetect.so,
+          libopencv_photo.so,
+          libopencv_shape.so,
+          libopencv_stitching.so,
+          libopencv_superres.so,
+          libopencv_ts.a,
+          libopencv_video.so,
+          libopencv_videoio.so, and
+          libopencv_videostab.so
+        </seg>
+        <seg>
+          /usr/include/opencv{,2} and
+          /usr/share/OpenCV
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+<!--
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="opencv_annotation">
+        <term><command>opencv_annotation</command></term>
+        <listitem>
+          <para>
+            ???
+          </para>
+          <indexterm zone="opencv opencv_annotation">
+            <primary sortas="b-opencv">opencv_annotation</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+-->
+  </sect2>
+
+</sect1>
Index: general/graphlib/openjpeg.xml
===================================================================
--- general/graphlib/openjpeg.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/openjpeg.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -34,5 +34,5 @@
     and can compress/decompress lossless 16-bit images.</para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -57,5 +57,13 @@
       </listitem>
     </itemizedlist>
-
+<!--
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/openjpeg-&openjpeg-version;-security_fixes-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+-->
     <bridgehead renderas="sect3">OpenJPEG Dependencies</bridgehead>
 
@@ -96,8 +104,20 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
+    <para><option>--disable-static</option>: This prevents the
+    static library from being built.</para>
 
   </sect2>
+
+  <!--
+  <sect2 role="configuration">
+    <title>Configuring OpenJPEG</title>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+    </sect3>
+
+  </sect2>
+  -->
 
   <sect2 role="content">
Index: general/graphlib/openjpeg2.xml
===================================================================
--- general/graphlib/openjpeg2.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/openjpeg2.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -31,42 +31,30 @@
 
     <para>
-      <application>OpenJPEG</application> is an open-source implementation
-      of the JPEG-2000 standard. OpenJPEG fully respects the JPEG-2000
+      <application>OpenJPEG</application> is an open-source implementation of
+      the JPEG-2000 standard. OpenJPEG fully respects the JPEG-2000
       specifications and can compress/decompress lossless 16-bit images.
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>
-          Download (HTTP): <ulink url="&openjpeg2-download-http;"/>
-        </para>
+        <para>Download (HTTP): <ulink url="&openjpeg2-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>
-          Download (FTP): <ulink url="&openjpeg2-download-ftp;"/>
-        </para>
+        <para>Download (FTP): <ulink url="&openjpeg2-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>
-          Download MD5 sum: &openjpeg2-md5sum;
-        </para>
+        <para>Download MD5 sum: &openjpeg2-md5sum;</para>
       </listitem>
       <listitem>
-        <para>
-          Download size: &openjpeg2-size;
-        </para>
+        <para>Download size: &openjpeg2-size;</para>
       </listitem>
       <listitem>
-        <para>
-          Estimated disk space required: &openjpeg2-buildsize;
-        </para>
+        <para>Estimated disk space required: &openjpeg2-buildsize;</para>
       </listitem>
       <listitem>
-        <para>
-          Estimated build time: &openjpeg2-time;
-        </para>
+        <para>Estimated build time: &openjpeg2-time;</para>
       </listitem>
     </itemizedlist>
@@ -81,13 +69,13 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="doxygen"/> (to build the API documentation),
-      <xref linkend="lcms2"/>,
-      <xref linkend="libpng"/> and
-      <xref linkend="libtiff"/>
+    <xref linkend="lcms2"/>,
+    <xref linkend="libpng"/>,
+    <xref linkend="libtiff"/>, and
+    <xref linkend="doxygen"/> (to build the API documentation)
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/openjpeg2"/>
-    </para>
+    <ulink url="&blfs-wiki;/openjpeg2"/></para>
+
   </sect2>
 
@@ -100,15 +88,15 @@
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
+<screen><userinput>mkdir -v build &amp;&amp;
+cd       build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      .. &amp;&amp;
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
 make</userinput></screen>
 
-    <para>
-      This package does not have a working testsuite.
-    </para>
+<!-- Thread discussing the tests, fixing instructions,
+  but obtaining poor results:
+  http://lists.linuxfromscratch.org/pipermail/blfs-dev/2015-April/030035.html
+-->
+    <para>This package does not come with a working test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -117,11 +105,18 @@
 
 pushd ../doc &amp;&amp;
-for man in man/man?/*
-do
-  install -v -Dm644 $man /usr/share/$man
+for man in man/man?/* ; do
+    install -v -D -m 644 $man /usr/share/$man
 done         &amp;&amp;
 popd</userinput></screen>
 
   </sect2>
+<!--
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><option>-DBUILD_TESTING=ON</option>: This switch enables
+    building the test suite.</para>
+
+  </sect2>-->
 
   <sect2 role="content">
@@ -134,14 +129,7 @@
 
       <seglistitem>
-        <seg>
-          opj_compress, opj_decompress and opj_dump
-        </seg>
-        <seg>
-          libopenjp2.so
-        </seg>
-        <seg>
-          /usr/include/openjpeg-2.1 and
-          /usr/lib/openjpeg-2.1
-        </seg>
+        <seg>opj_compress, opj_decompress, and opj_dump</seg>
+        <seg>libopenjp2.so</seg>
+        <seg>/usr/include/openjpeg-2.1 and /usr/lib/openjpeg-2.1</seg>
       </seglistitem>
     </segmentedlist>
@@ -155,7 +143,5 @@
         <term><command>opj_compress</command></term>
         <listitem>
-          <para>
-            converts various image formats to the JPEG-2000 format.
-          </para>
+          <para>converts various image formats to the jpeg2000 format.</para>
           <indexterm zone="openjpeg2 opj_compress">
             <primary sortas="b-opj_compress">opj_compress</primary>
@@ -167,7 +153,5 @@
         <term><command>opj_decompress</command></term>
         <listitem>
-          <para>
-            converts JPEG-2000 images to other image types.
-          </para>
+          <para>converts jpeg2000 images to other image types.</para>
           <indexterm zone="openjpeg2 opj_decompress">
             <primary sortas="b-opj_decompress">opj_decompress</primary>
@@ -179,7 +163,5 @@
         <term><command>opj_dump</command></term>
         <listitem>
-          <para>
-            reads in a JPEG-2000 image and dumps the contents to stdout.
-          </para>
+          <para>reads in a jpeg2000 image and dumps the contents to stdout.</para>
           <indexterm zone="openjpeg2 opj_dump">
             <primary sortas="b-opj_dump">opj_dump</primary>
Index: general/graphlib/pixman.xml
===================================================================
--- general/graphlib/pixman.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/pixman.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -8,6 +8,6 @@
   <!ENTITY pixman-download-ftp  " ">
   <!ENTITY pixman-md5sum        "e588622e375e7d578e9df320f1ace2de">
-  <!ENTITY pixman-size          "808 KB">
-  <!ENTITY pixman-buildsize     "36 MB (with test suite)">
+  <!ENTITY pixman-size          "806 KB">
+  <!ENTITY pixman-buildsize     "37 MB (additional 3 MB for tests)">
   <!ENTITY pixman-time          "0.4 SBU (additional 0.8 SBU for tests)">
 ]>
Index: neral/graphlib/poppler-systemd.xml
===================================================================
--- general/graphlib/poppler-systemd.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ 	(revision )
@@ -1,487 +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 poppler-download-http
-           "http://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
-  <!ENTITY poppler-download-ftp       " ">
-  <!ENTITY poppler-md5sum             "561ef4454bfabe59ef1b8b9cd4aa4c4b">
-  <!ENTITY poppler-size               "1.5 MB">
-  <!ENTITY poppler-buildsize          "123 MB">
-  <!ENTITY poppler-time               "0.8 SBU">
-
-  <!ENTITY poppler-data-version       "0.4.7">
-
-  <!ENTITY poppler-data-download-http
-           "http://poppler.freedesktop.org/poppler-data-&poppler-data-version;.tar.gz">
-  <!ENTITY poppler-data-md5sum        "636a8f2b9f6df9e7ced8ec0946961eaf">
-  <!ENTITY poppler-data-size          "4.0 MB">
-]>
-
-<sect1 id="poppler" xreflabel="Poppler-&poppler-version;">
-  <?dbhtml filename="poppler.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Poppler-&poppler-version;</title>
-
-  <indexterm zone="poppler">
-    <primary sortas="a-Poppler">Poppler</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Poppler</title>
-
-    <para>
-      The <application>Poppler</application> package contains a PDF rendering
-      library and command line tools used to manipulate PDF files. This is
-      useful for providing PDF rendering functionality as a shared library.
-    </para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&poppler-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&poppler-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &poppler-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &poppler-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &poppler-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &poppler-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <title>Poppler Encoding Data</title>
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&poppler-data-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &poppler-data-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &poppler-data-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      The additional package consists of encoding files for use with
-      <application>Poppler</application>. The encoding files are optional and
-      <application>Poppler</application> will automatically read them if they
-      are present. When installed, they enable
-      <application>Poppler</application> to render CJK and Cyrillic properly.
-    </para>
-
-    <bridgehead renderas="sect3">Poppler Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="fontconfig"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cairo"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>, and
-      <xref linkend="openjpeg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="gtk2"/>,
-      <xref linkend="lcms"/> or <xref linkend="lcms2"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="openjpeg2"/> (<application>OpenJPEG1</application> is preferred
-      due to regressions in <application>OpenJPEG2</application> code),
-      <xref linkend="qt4"/> (the <filename>libpoppler-qt4.so</filename> library
-      is needed for PDF support in <application>Okular</application>), and
-      <xref linkend="qt5"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/poppler"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Poppler</title>
-
-    <para>
-      In order to optionally run the test suite, an additional download
-      of about 9 MB using <xref linkend="git"/> is necessary.
-    </para>
-
-<screen><userinput>rm -rf testfiles &amp;&amp;
-git clone git://git.freedesktop.org/git/poppler/test testfiles</userinput></screen>
-
-    <para>
-      Install <application>Poppler</application> by running the following
-      commands:
-    </para>
-
-<!-- Warning: Using zlib is not totally safe -->
-<screen><userinput>./configure --prefix=/usr         \
-            --sysconfdir=/etc     \
-            --disable-static      \
-            --enable-xpdf-headers \
-            --with-testdatadir=$PWD/testfiles &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>LC_ALL=en_US.UTF-8 make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      The documents are installed using the following commands:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755        /usr/share/doc/poppler-&poppler-version; &amp;&amp;
-install -v -m644 README* /usr/share/doc/poppler-&poppler-version;</userinput></screen>
-
-    <para>
-      If you downloaded the additional encoding data package, install it by
-      issuing the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen><userinput>tar -xf ../poppler-data-&poppler-data-version;.tar.gz &amp;&amp;
-cd poppler-data-&poppler-data-version;</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make prefix=/usr 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"/>
-
-    <para>
-      <option>--enable-xpdf-headers</option>: Install some old
-      <application>Xpdf</application> headers required by certain programs (e.g.
-      <application>Okular</application>, <application>LibreOffice</application>
-      and <application>Inkscape</application>).
-    </para>
-
-    <para>
-      <option>--with-testdatadir=$PWD/testfiles</option>: This switch is used
-      to tell the test programs where the auxillary files are located.
-    </para>
-
-    <para>
-      <option>--enable-libcurl</option>: Use libcurl for HTTP support.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <command>LC_ALL=en_US.UTF-8 make check</command>: Run the test suite.
-      The environment variable LC_ALL=en_US.UTF-8 is only needed if the
-      default locale does not include UTF-8.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pdfdetach, pdffonts, pdfimages, pdfinfo, pdfseparate,
-          pdftocairo, pdftohtml, pdftoppm, pdftops, pdftotext,
-          pdfunite, and poppler-glib-demo
-        </seg>
-        <seg>
-          libpoppler.so, libpoppler-cpp.so,
-          libpoppler-glib.so,
-          libpoppler-qt4.so, and
-          libpoppler-qt5.so
-        </seg>
-        <seg>
-          /usr/include/poppler,
-          /usr/share/doc/poppler-&poppler-version;,
-          /usr/share/gtk-doc/html/poppler, and
-          /usr/share/poppler
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pdfdetach">
-        <term><command>pdfdetach</command></term>
-        <listitem>
-          <para>
-            lists or extracts embedded files from PDF files.
-          </para>
-          <indexterm zone="poppler pdfdetach">
-            <primary sortas="b-pdfdetach">pdfdetach</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdffonts">
-        <term><command>pdffonts</command></term>
-        <listitem>
-          <para>
-            lists the fonts used in a PDF file along with various information
-            for each font.
-          </para>
-          <indexterm zone="poppler pdffonts">
-            <primary sortas="b-pdffonts">pdffonts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfimages">
-        <term><command>pdfimages</command></term>
-        <listitem>
-          <para>
-            saves images from a PDF file as PPM, PBM, or JPEG files.
-          </para>
-          <indexterm zone="poppler pdfimages">
-            <primary sortas="b-pdfimages">pdfimages</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfinfo">
-        <term><command>pdfinfo</command></term>
-        <listitem>
-          <para>
-            prints the contents of the 'Info' dictionary (plus some other useful
-            information) from a PDF file.
-          </para>
-          <indexterm zone="poppler pdfinfo">
-            <primary sortas="b-pdfinfo">pdfinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfseparate">
-        <term><command>pdfseparate</command></term>
-        <listitem>
-          <para>
-            extracts single pages from a PDF file.
-          </para>
-          <indexterm zone="poppler pdfseparate">
-            <primary sortas="b-pdseparate">pdfseparate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftocairo">
-        <term><command>pdftocairo</command></term>
-        <listitem>
-          <para>
-            converts a PDF file to one of several formats (PNG, JPEG, PDF, PS,
-            EPS, SVG) using the cairo output device of the poppler library.
-          </para>
-          <indexterm zone="poppler pdftocairo">
-            <primary sortas="b-pdftocairo">pdftocairo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftohtml">
-        <term><command>pdftohtml</command></term>
-        <listitem>
-          <para>
-            converts a PDF file to HTML.
-          </para>
-          <indexterm zone="poppler pdftohtml">
-            <primary sortas="b-pdftohtml">pdftohtml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftoppm">
-        <term><command>pdftoppm</command></term>
-        <listitem>
-          <para>
-            converts PDF files to PBM, PGM and PPM formats.
-          </para>
-          <indexterm zone="poppler pdftoppm">
-            <primary sortas="b-pdftoppm">pdftoppm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftops">
-        <term><command>pdftops</command></term>
-        <listitem>
-          <para>
-            converts PDF files to Postscript format.
-          </para>
-          <indexterm zone="poppler pdftops">
-            <primary sortas="b-pdftops">pdftops</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdftotext">
-        <term><command>pdftotext</command></term>
-        <listitem>
-          <para>
-            converts PDF files to plain text.
-          </para>
-          <indexterm zone="poppler pdftotext">
-            <primary sortas="b-pdftotext">pdftotext</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfunite">
-        <term><command>pdfunite</command></term>
-        <listitem>
-          <para>
-            merges several PDF files, in the order of their occurrence on the
-            command line, to one PDF output file.
-          </para>
-          <indexterm zone="poppler pdfunite">
-            <primary sortas="b-pdfunite">pdfunite</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="poppler-glib-demo">
-        <term><command>poppler-glib-demo</command></term>
-        <listitem>
-          <para>
-            is a tool to demonstrate the API, and for use when debugging and
-            testing <application>Poppler</application>.
-          </para>
-          <indexterm zone="poppler poppler-glib-demo">
-            <primary sortas="b-poppler-glib-demo">poppler-glib-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler">
-        <term><filename class="libraryfile">libpoppler.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions to render PDF files.
-          </para>
-          <indexterm zone="poppler libpoppler">
-            <primary sortas="c-libpoppler">libpoppler.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-cpp">
-        <term><filename class="libraryfile">libpoppler-cpp.so</filename></term>
-        <listitem>
-          <para>
-            is a C++ backend for rendering PDF files.
-          </para>
-          <indexterm zone="poppler libpoppler-cpp">
-            <primary sortas="c-libpoppler-cpp">libpoppler-cpp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-glib">
-        <term><filename class="libraryfile">libpoppler-glib.so</filename></term>
-        <listitem>
-          <para>
-            is a wrapper library used to interface the PDF rendering functions
-            with <application>GTK+</application>.
-          </para>
-          <indexterm zone="poppler libpoppler-glib">
-            <primary sortas="c-libpoppler-glib">libpoppler-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-qt4">
-        <term><filename class="libraryfile">libpoppler-qt4.so</filename></term>
-        <listitem>
-          <para>
-            is a wrapper library used to interface the PDF rendering functions
-            with <application>Qt</application>4.
-          </para>
-          <indexterm zone="poppler libpoppler-qt4">
-            <primary sortas="c-libpoppler-qt4">libpoppler-qt4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-qt5">
-        <term><filename class="libraryfile">libpoppler-qt5.so</filename></term>
-        <listitem>
-          <para>
-            is a wrapper library used to interface the PDF rendering functions
-            with <application>Qt</application>5.
-          </para>
-          <indexterm zone="poppler libpoppler-qt5">
-            <primary sortas="c-libpoppler-qt5">libpoppler-qt5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/poppler.xml
===================================================================
--- general/graphlib/poppler.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
+++ general/graphlib/poppler.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -0,0 +1,530 @@
+<?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 poppler-download-http "http://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
+  <!ENTITY poppler-download-ftp       " ">
+  <!ENTITY poppler-md5sum             "2fec3b2401a1722418b1f5bf64cd00cd">
+  <!ENTITY poppler-size               "1.6 MB (additional 9 MB for the test suite)">
+  <!ENTITY poppler-buildsize          "65 MB (with Qt4 and Qt5 libraries, and tests)">
+  <!ENTITY poppler-time               "1.6 SBU (with Qt4 and Qt5 libraries, and tests)">
+
+
+  <!ENTITY poppler-data-version       "0.4.7">
+
+  <!ENTITY poppler-data-download-http "http://poppler.freedesktop.org/poppler-data-&poppler-data-version;.tar.gz">
+  <!ENTITY poppler-data-md5sum        "636a8f2b9f6df9e7ced8ec0946961eaf">
+  <!ENTITY poppler-data-size          "4.0 MB">
+  <!ENTITY poppler-data-buildsize     "24 MB">
+  <!ENTITY poppler-data-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="poppler" xreflabel="Poppler-&poppler-version;">
+  <?dbhtml filename="poppler.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Poppler-&poppler-version;</title>
+
+  <indexterm zone="poppler">
+    <primary sortas="a-Poppler">Poppler</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Poppler</title>
+
+    <para>
+      The <application>Poppler</application> package contains a PDF rendering
+      library and command line tools used to manipulate PDF files. This is
+      useful for providing PDF rendering functionality as a shared library.
+    </para>
+
+    &lfs78_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&poppler-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&poppler-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &poppler-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &poppler-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &poppler-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &poppler-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+
+    <itemizedlist spacing="compact">
+      <title>Poppler Encoding Data</title>
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&poppler-data-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &poppler-data-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &poppler-data-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &poppler-data-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &poppler-data-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para>
+      The additional package consists of encoding files for use with
+      <application>Poppler</application>. The encoding files are optional and
+      <application>Poppler</application> will automatically read them if they
+      are present. When installed, they enable
+      <application>Poppler</application> to render CJK and Cyrillic properly.
+    </para>
+
+    <bridgehead renderas="sect3">Poppler Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="fontconfig"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="cairo"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libpng"/>, and
+      <xref linkend="openjpeg"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="curl"/>,
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="gtk2"/>,
+      <xref linkend="lcms"/> or <xref linkend="lcms2"/>,
+      <xref linkend="libtiff"/>,
+      <xref linkend="openjpeg2"/>
+      (preference is for OpenJPEG1, due to regressions with OpenJPEG2),
+      <xref linkend="qt4"/> (the <filename>libpoppler-qt4.so</filename> library
+      is needed for PDF support in <application>Okular</application>), and
+      <xref linkend="qt5"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/poppler"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Poppler</title>
+
+    <para>
+      In order to optionally run the test suite, an additional download using
+      <xref linkend="git"/> is necessary.
+    </para>
+
+<screen><userinput>rm -rf testfiles &amp;&amp;
+git clone git://git.freedesktop.org/git/poppler/test testfiles</userinput></screen>
+
+    <note>
+      <para>
+        This package can be optionally built with support for only one version
+        of Qt4 or Qt5 or without any Qt support. You can selectively disable
+        support for one or both, see "Command Explanations" section, below.
+      </para>
+    </note>
+
+    <para>
+      Install <application>Poppler</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr               \
+            --sysconfdir=/etc           \
+            --disable-static            \
+            --enable-build-type=release \
+            --enable-cmyk               \
+            --enable-xpdf-headers       \
+            --with-testdatadir=$PWD/testfiles &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>LC_ALL=en_US.UTF-8 make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      To install the documentation, run the following commands as
+      <systemitem class="username">root</systemitem>:
+    </para>
+
+<screen role="root"><userinput>install -v -m755 -d        /usr/share/doc/poppler-&poppler-version; &amp;&amp;
+install -v -m644 README*   /usr/share/doc/poppler-&poppler-version; &amp;&amp;
+cp -vr glib/reference/html /usr/share/doc/poppler-&poppler-version;</userinput></screen>
+
+<!-- ==== Poppler Data ====== -->
+    <bridgehead renderas="sect3">Poppler Data</bridgehead>
+
+    <para>
+      If you downloaded the additional encoding data package, install it by
+      issuing the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen><userinput>tar -xf ../poppler-data-&poppler-data-version;.tar.gz &amp;&amp;
+cd poppler-data-&poppler-data-version;</userinput></screen>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make prefix=/usr install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>--enable-build-type=release</parameter>: This switch is used
+      to apply a higher level of compiler optimizations. Other options are:
+      [<option>relwithdebinfo/debug/debugfull/profile</option>]
+    </para>
+
+    <para>
+      <parameter>--enable-cmyk</parameter>:
+      Include support for CMYK rasterization.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <parameter>--enable-xpdf-headers</parameter>: Install some old
+      <application>Xpdf</application> headers required by certain programs (e.g.
+      <application>Okular</application>, <application>LibreOffice</application>
+      and <application>Inkscape</application>).
+    </para>
+
+    <para>
+      <parameter>--with-testdatadir=$PWD/testfiles</parameter>: Tell the test
+      programs where the auxillary files are located.
+    </para>
+
+    <para>
+      <option>--enable-libcurl</option>: Use libcurl for HTTP support.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+    <para>
+      <option>--disable-poppler-qt4</option>: Don't compile poppler Qt4 wrapper.
+    </para>
+
+    <para>
+      <option>--disable-poppler-qt5</option>: Don't compile poppler Qt5 wrapper.
+    </para>
+
+    <para>
+      <command>LC_ALL=en_US.UTF-8 make check</command>: Run the test suite.
+      The environment variable LC_ALL=en_US.UTF-8 is only needed if the
+      default locale does not include UTF-8.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          pdfdetach, pdffonts, pdfimages, pdfinfo, pdfseparate,
+          pdftocairo, pdftohtml, pdftoppm, pdftops, pdftotext,
+          pdfunite, and poppler-glib-demo
+        </seg>
+        <seg>
+          libpoppler.so,
+          libpoppler-cpp.so,
+          libpoppler-glib.so,
+          libpoppler-qt4.so, and
+          libpoppler-qt5.so
+        </seg>
+        <seg>
+          /usr/{include,share,share/gtk-doc/html}/poppler and
+          /usr/share/doc/poppler-&poppler-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="pdfdetach">
+        <term><command>pdfdetach</command></term>
+        <listitem>
+          <para>
+            lists or extracts embedded files from PDF files.
+          </para>
+          <indexterm zone="poppler pdfdetach">
+            <primary sortas="b-pdfdetach">pdfdetach</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pdffonts">
+        <term><command>pdffonts</command></term>
+        <listitem>
+          <para>
+            lists the fonts used in a PDF file along with various information
+            for each font.
+          </para>
+          <indexterm zone="poppler pdffonts">
+            <primary sortas="b-pdffonts">pdffonts</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pdfimages">
+        <term><command>pdfimages</command></term>
+        <listitem>
+          <para>
+            saves images from a PDF file as PPM, PBM, or JPEG files.
+          </para>
+          <indexterm zone="poppler pdfimages">
+            <primary sortas="b-pdfimages">pdfimages</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pdfinfo">
+        <term><command>pdfinfo</command></term>
+        <listitem>
+          <para>
+            prints the contents of the 'Info' dictionary (plus some other useful
+            information) from a PDF file.
+          </para>
+          <indexterm zone="poppler pdfinfo">
+            <primary sortas="b-pdfinfo">pdfinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pdfseparate">
+        <term><command>pdfseparate</command></term>
+        <listitem>
+          <para>
+            extracts single pages from a PDF file.
+          </para>
+          <indexterm zone="poppler pdfseparate">
+            <primary sortas="b-pdseparate">pdfseparate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pdftocairo">
+        <term><command>pdftocairo</command></term>
+        <listitem>
+          <para>
+            converts a PDF file to one of several formats (PNG, JPEG, PDF, PS,
+            EPS, SVG) using the cairo output device of the poppler library.
+          </para>
+          <indexterm zone="poppler pdftocairo">
+            <primary sortas="b-pdftocairo">pdftocairo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pdftohtml">
+        <term><command>pdftohtml</command></term>
+        <listitem>
+          <para>
+            converts a PDF file to HTML.
+          </para>
+          <indexterm zone="poppler pdftohtml">
+            <primary sortas="b-pdftohtml">pdftohtml</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pdftoppm">
+        <term><command>pdftoppm</command></term>
+        <listitem>
+          <para>
+            converts PDF files to PBM, PGM and PPM formats.
+          </para>
+          <indexterm zone="poppler pdftoppm">
+            <primary sortas="b-pdftoppm">pdftoppm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pdftops">
+        <term><command>pdftops</command></term>
+        <listitem>
+          <para>
+            converts PDF files to Postscript format.
+          </para>
+          <indexterm zone="poppler pdftops">
+            <primary sortas="b-pdftops">pdftops</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pdftotext">
+        <term><command>pdftotext</command></term>
+        <listitem>
+          <para>
+            converts PDF files to plain text.
+          </para>
+          <indexterm zone="poppler pdftotext">
+            <primary sortas="b-pdftotext">pdftotext</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pdfunite">
+        <term><command>pdfunite</command></term>
+        <listitem>
+          <para>
+            merges several PDF files, in the order of their occurrence on the
+            command line, to one PDF output file.
+          </para>
+          <indexterm zone="poppler pdfunite">
+            <primary sortas="b-pdfunite">pdfunite</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="poppler-glib-demo">
+        <term><command>poppler-glib-demo</command></term>
+        <listitem>
+          <para>
+            is a tool to demonstrate the API, and for use when debugging and
+            testing <application>Poppler</application>.
+          </para>
+          <indexterm zone="poppler poppler-glib-demo">
+            <primary sortas="b-poppler-glib-demo">poppler-glib-demo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpoppler">
+        <term><filename class="libraryfile">libpoppler.so</filename></term>
+        <listitem>
+          <para>
+            contains the API functions to render PDF files.
+          </para>
+          <indexterm zone="poppler libpoppler">
+            <primary sortas="c-libpoppler">libpoppler.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpoppler-cpp">
+        <term><filename class="libraryfile">libpoppler-cpp.so</filename></term>
+        <listitem>
+          <para>
+            is a C++ backend for rendering PDF files.
+          </para>
+          <indexterm zone="poppler libpoppler-cpp">
+            <primary sortas="c-libpoppler-cpp">libpoppler-cpp.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpoppler-glib">
+        <term><filename class="libraryfile">libpoppler-glib.so</filename></term>
+        <listitem>
+          <para>
+            is a wrapper library used to interface the PDF rendering functions
+            with <application>GTK+</application>.
+          </para>
+          <indexterm zone="poppler libpoppler-glib">
+            <primary sortas="c-libpoppler-glib">libpoppler-glib.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpoppler-qt4">
+        <term><filename class="libraryfile">libpoppler-qt4.so</filename></term>
+        <listitem>
+          <para>
+            is a wrapper library used to interface the PDF rendering functions
+            with <application>Qt</application>4.
+          </para>
+          <indexterm zone="poppler libpoppler-qt4">
+            <primary sortas="c-libpoppler-qt4">libpoppler-qt4.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpoppler-qt5">
+        <term><filename class="libraryfile">libpoppler-qt5.so</filename></term>
+        <listitem>
+          <para>
+            is a wrapper library used to interface the PDF rendering functions
+            with <application>Qt</application>5.
+          </para>
+          <indexterm zone="poppler libpoppler-qt5">
+            <primary sortas="c-libpoppler-qt5">libpoppler-qt5.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/graphlib/qpdf.xml
===================================================================
--- general/graphlib/qpdf.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ general/graphlib/qpdf.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -7,8 +7,8 @@
   <!ENTITY qpdf-download-http "&sourceforge-repo;/qpdf/qpdf-&qpdf-version;.tar.gz">
   <!ENTITY qpdf-download-ftp  " ">
-  <!ENTITY qpdf-md5sum        "aafbf3950230f84d7998b700b12428f4">
-  <!ENTITY qpdf-size          "7.4 MB">
-  <!ENTITY qpdf-buildsize     "106 MB">
-  <!ENTITY qpdf-time          "1.0 SBU">
+  <!ENTITY qpdf-md5sum        "e014bd3ecf1c4d1a520bbc14d84ac20e">
+  <!ENTITY qpdf-size          "8 MB">
+  <!ENTITY qpdf-buildsize     "108 MB (with tests)">
+  <!ENTITY qpdf-time          "1.0 SBU (with tests)">
 ]>
 
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ introduction/welcome/changelog.xml	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -46,5 +46,63 @@
 
     <listitem>
-      <para>January 24th, 2016</para>
+      <para>January 26th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Fix sed in boost. Merged from trunk r16843.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to babl-0.1.14. Merged from trunk r16677.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to freetype2-2.6.2. Merged from trunk
+          r16694.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to fribidi-0.19.7. Merged from trunk
+          r16332.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to giflib-5.1.2. Merged from trunk r16795.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to graphite2-1.3.5. Merged from trunk
+          r16825.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to harfbuzz-1.1.3. Merged from trunk
+          r16802.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to libpng-1.6.21. Merged from trunk
+          r16830.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to librsvg-2.40.13. Merged from trunk
+          r16795.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to libraw-0.17.1. Merged from trunk
+          r16686.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to libwebp-0.5.0. Merged from trunk
+          r16755.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to poppler-0.40.0. Merged from trunk
+          r16809.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Updated to qpdf-6.0.0. Merged from trunk r16636.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Added OpenCV-. Merged from trunk r16194 and
+          r16749.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>January 25th, 2016</para>
       <itemizedlist>
         <listitem>
Index: packages.ent
===================================================================
--- packages.ent	(revision a6a9fc5246f669f5693948e45a376b2a9590068e)
+++ packages.ent	(revision 94b4def91538596238c37d90787b2c44d2bec462)
@@ -157,13 +157,13 @@
 <!-- Chapter 10 -->
 <!ENTITY aalib-version                "1.4rc5">
-<!ENTITY babl-version                 "0.1.12">
+<!ENTITY babl-version                 "0.1.14">
 <!ENTITY exiv2-version                "0.25">
-<!ENTITY freetype2-version            "2.6.1">
+<!ENTITY freetype2-version            "2.6.2">
 <!ENTITY fontconfig-version           "2.11.1">  <!-- stable lt .90 micro version -->
-<!ENTITY fribidi-version              "0.19.6">
+<!ENTITY fribidi-version              "0.19.7">
 <!ENTITY gegl-version                 "0.2.0">
-<!ENTITY giflib-version               "5.1.1">
-<!ENTITY graphite2-version            "1.3.3">
-<!ENTITY harfbuzz-version             "1.1.0">
+<!ENTITY giflib-version               "5.1.2">
+<!ENTITY graphite2-version            "1.3.5">
+<!ENTITY harfbuzz-version             "1.1.3">
 <!ENTITY ijs-version                  "0.35">
 <!ENTITY jasper-version               "1.900.1">
@@ -174,17 +174,18 @@
 <!ENTITY libjpeg-turbo-version        "1.4.2">
 <!ENTITY libmng-version               "2.0.3">
-<!ENTITY libpng-version               "1.6.19">
-<!ENTITY librsvg-version              "2.40.10">   <!-- Normally even minors
+<!ENTITY libpng-version               "1.6.21">
+<!ENTITY librsvg-version              "2.40.13">   <!-- Normally even minors
                                                        Required version in order to use
                                                        svg pixbuf loader. -->
-<!ENTITY libraw-version               "0.16.2">
+<!ENTITY libraw-version               "0.17.1">
 <!ENTITY libtiff-version              "4.0.6">
-<!ENTITY libwebp-version              "0.4.3">
+<!ENTITY libwebp-version              "0.5.0">
 <!ENTITY newt-version                 "0.52.18">
+<!ENTITY opencv-version               "3.1.0">
 <!ENTITY openjpeg-version             "1.5.2">
 <!ENTITY openjpeg2-version            "2.1.0">
 <!ENTITY pixman-version               "0.32.8">   <!-- Even minors only -->
-<!ENTITY poppler-version              "0.35.0">
-<!ENTITY qpdf-version                 "5.1.3">
+<!ENTITY poppler-version              "0.40.0">
+<!ENTITY qpdf-version                 "6.0.0">
 
 <!-- Chapter 11 -->
