Index: general/genlib/icu.xml
===================================================================
--- general/genlib/icu.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/genlib/icu.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -74,4 +74,11 @@
       </listitem>
     </itemizedlist>
+
+    <bridgehead renderas="sect3">ICU Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="llvm"/> (with Clang)
+    </para>
 
     <para condition="html" role="usernotes">
Index: general/genlib/iso-codes.xml
===================================================================
--- general/genlib/iso-codes.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/genlib/iso-codes.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -7,6 +7,6 @@
   <!ENTITY iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz">
   <!ENTITY iso-codes-download-ftp  " ">
-  <!ENTITY iso-codes-md5sum        "7ad31f8488a6cc26a142b9bf5e4eea2c">
-  <!ENTITY iso-codes-size          "3.5 MB">
+  <!ENTITY iso-codes-md5sum        "35c6089108410dcfe03b420b57af0dde">
+  <!ENTITY iso-codes-size          "3.6 MB">
   <!ENTITY iso-codes-buildsize     "110 MB">
   <!ENTITY iso-codes-time          "0.2 SBU">
Index: general/genlib/json-c.xml
===================================================================
--- general/genlib/json-c.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/genlib/json-c.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY json-c-download-http "https://github.com/downloads/json-c/json-c/json-c-&json-c-version;.tar.gz">
+  <!ENTITY json-c-download-http "https://s3.amazonaws.com/json-c_releases/releases/json-c-&json-c-version;.tar.gz">
   <!ENTITY json-c-download-ftp  " ">
-  <!ENTITY json-c-md5sum        "a4edc79410eb894f08d7d52ca9f88732">
-  <!ENTITY json-c-size          "380 KB">
-  <!ENTITY json-c-buildsize     "3.5 MB">
+  <!ENTITY json-c-md5sum        "aa02367d2f7a830bf1e3376f77881e98">
+  <!ENTITY json-c-size          "548 KB">
+  <!ENTITY json-c-buildsize     "5.0 MB">
   <!ENTITY json-c-time          "less than 0.1 SBU">
 ]>
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -86,9 +86,5 @@
     </para>
 
-<screen><userinput>sed -e 's/json_object.c/json_object.c json_object_iterator.c/'    \
-    -e 's/json_object.h/json_object.h json_object_iterator.h/'    \
-    -e 's/json_object.lo/json_object.lo json_object_iterator.lo/' \
-    -i Makefile.in &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -107,9 +103,4 @@
     <title>Command Explanations</title>
 
-    <para>
-      <command>sed -e 's/json_object...</command>: This <command>sed</command>
-      make sure that all the necessary headers are installed correctly.
-    </para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
@@ -122,6 +113,6 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -130,8 +121,9 @@
         </seg>
         <seg>
-          libjson.so
+          libjson-c.so and libjson.so
         </seg>
         <seg>
-          /usr/include/json
+          /usr/include/json and
+          /usr/include/json-c
         </seg>
       </seglistitem>
@@ -147,8 +139,20 @@
         <listitem>
           <para>
-            contains <application>JSON-C</application> API functions.
+            contains the <application>JSON-C</application> API functions.
           </para>
           <indexterm zone="json-c libjson">
             <primary sortas="c-libjson">libjson.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjson-c">
+        <term><filename class="libraryfile">libjson-c.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>JSON-C</application> API functions.
+          </para>
+          <indexterm zone="json-c libjson-c">
+            <primary sortas="c-libjson-c">libjson-c.so</primary>
           </indexterm>
         </listitem>
Index: general/genlib/libatasmart.xml
===================================================================
--- general/genlib/libatasmart.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/genlib/libatasmart.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/genlib/libdrm.xml
===================================================================
--- general/genlib/libdrm.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/genlib/libdrm.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -7,7 +7,7 @@
   <!ENTITY libdrm-download-http "http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2">
   <!ENTITY libdrm-download-ftp  " ">
-  <!ENTITY libdrm-md5sum        "b760b1f2ae4ec6452383164ec697cd5d">
-  <!ENTITY libdrm-size          "528 KB">
-  <!ENTITY libdrm-buildsize     "10 MB">
+  <!ENTITY libdrm-md5sum        "92ce56e7533a9b2fcb5c8f32d305328b">
+  <!ENTITY libdrm-size          "540 KB">
+  <!ENTITY libdrm-buildsize     "11 MB">
   <!ENTITY libdrm-time          "0.2 SBU">
 ]>
Index: general/genlib/libical.xml
===================================================================
--- general/genlib/libical.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/genlib/libical.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -7,8 +7,8 @@
   <!ENTITY libical-download-http "http://downloads.sourceforge.net/freeassociation/libical-&libical-version;.tar.gz">
   <!ENTITY libical-download-ftp  " ">
-  <!ENTITY libical-md5sum        "e549f434d5fbf9cd156c60ed4943618f">
-  <!ENTITY libical-size          "1.1 MB">
-  <!ENTITY libical-buildsize     "56 MB">
-  <!ENTITY libical-time          "0.5 SBU">
+  <!ENTITY libical-md5sum        "4438c31d00ec434f02867a267a92f8a1">
+  <!ENTITY libical-size          "1.2 MB">
+  <!ENTITY libical-buildsize     "20 MB">
+  <!ENTITY libical-time          "0.4 SBU">
 ]>
 
@@ -30,42 +30,65 @@
     <title>Introduction to libical</title>
 
-    <para>The <application>libical</application> package is an implementation of
-    iCalendar protocols and data formats.</para>
-
-    &lfs72_checked;
+    <para>
+      The <application>libical</application> package contains an implementation
+      of the iCalendar protocols and data formats.
+    </para>
+
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libical-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libical-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libical-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libical-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libical-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libical-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&libical-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libical-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libical-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libical-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libical-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libical-time;
+        </para>
       </listitem>
     </itemizedlist>
 
-    <!-- There is no support for the current version of BLFS BDB -->
     <bridgehead renderas="sect3">libical Dependencies</bridgehead>
 
+    <!-- Upstream recommends to use CMake since autotools
+    doesn't bump soname for 0.48 -> 1.0 incompatibility -->
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/>
+    </para>
+
+    <!-- Can't be built using CMake
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <!-- <para role="optional"><xref linkend="db"/></para> -->
-    <para role="optional"><xref linkend="python2"/> (must have
-    <ulink url="http://www.swig.org/">SWIG</ulink> also)</para>
+    <para role="optional">
+      <xref linkend="openjdk"/> and
+      <xref linkend="python2"/> (must have
+      <ulink url="http://www.swig.org/">SWIG</ulink> also)
+    </para> -->
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libical"/></para>
-
+      <ulink url="&blfs-wiki;/libical"/>
+    </para>
   </sect2>
 
@@ -73,33 +96,46 @@
     <title>Installation of libical</title>
 
-    <para>Install <application>libical</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --enable-cxx &amp;&amp;
+    <para>
+      Install <application>libical</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      .. &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 &amp;&amp;
-install -v -m755 -d /usr/share/doc/libical-&libical-version; &amp;&amp;
-install -v -m644    README doc/{Adding,Using}*.txt \
-                    /usr/share/doc/libical-&libical-version;</userinput></screen>
-
-  </sect2>
-
-  <!--  There is no support for the current version of BLFS BDB -->
+    <para>
+      To test the results, issue: <command>make test</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>
 
-    <!-- <para><option>-with-bdb4</option>: This option adds support for
-    <application>Berkeley DB 4.0</application>.</para> -->
-
-    <para><parameter>--enable-cxx</parameter>: This parameter builds C++
-    <application>libical</application> library bindings.</para>
-
-    <para><option>--enable-python</option>: This option builds Python
-    <application>libical</application> bindings.</para>
+    <para>
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
+      to apply higher level of the compiler optimizations.
+    </para>
+
+    <!-- No CMake equivalents
+    <para>
+      <parameter>- -enable-cxx</parameter>: This switch enables
+      <application>libical</application> C++ library.
+    </para>
+
+    <para>
+      <option>- -enable-python</option>: This switch enables
+      <application>libical</application> Python bindings.
+    </para> -->
 
   </sect2>
@@ -111,11 +147,16 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libical{,_cxx}.{so,a}, libicalss{,_cxx}.{so,a}, libicalvcal.{so,a},
-        and (optionally) the Python _LibicalWrap.{so,a} modules</seg>
-        <seg>/usr/include/libical and /usr/share/doc/libical-&libical-version;</seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libical.{so,a}, libicalss.{so,a} and libicalvcal.{so,a}
+        </seg>
+        <seg>
+          /usr/include/libical
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -127,8 +168,10 @@
 
       <varlistentry id="libical-lib">
-        <term><filename class='libraryfile'>libical.{so,a}</filename></term>
+        <term><filename class="libraryfile">libical.{so,a}</filename></term>
         <listitem>
-          <para>contains the <application>libical</application> API
-          functions.</para>
+          <para>
+            contains the <application>libical</application> API
+            functions.
+          </para>
           <indexterm zone="libical libical-lib">
             <primary sortas="c-libical">libical.{so,a}</primary>
@@ -138,8 +181,10 @@
 
       <varlistentry id="libicalss">
-        <term><filename class='libraryfile'>libicalss.{so,a}</filename></term>
+        <term><filename class="libraryfile">libicalss.{so,a}</filename></term>
         <listitem>
-          <para>is a libary that allows you to store iCal component data to disk
-          in a variety of ways.</para>
+          <para>
+            is a libary that allows you to store iCal component data
+            to disk in a variety of ways.
+          </para>
           <indexterm zone="libical libicalss">
             <primary sortas="c-libicalss">libicalss.{so,a}</primary>
@@ -149,7 +194,9 @@
 
       <varlistentry id="libicalvcal">
-        <term><filename class='libraryfile'>libicalvcal.{so,a}</filename></term>
+        <term><filename class="libraryfile">libicalvcal.{so,a}</filename></term>
         <listitem>
-          <para>is a vCard/vCalendar C interface.</para>
+          <para>
+            is a vCard/vCalendar C interface.
+          </para>
           <indexterm zone="libical libicalvcal">
             <primary sortas="c-libicalvcal">libicalvcal.{so,a}</primary>
Index: general/genlib/libidn.xml
===================================================================
--- general/genlib/libidn.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/genlib/libidn.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -7,11 +7,11 @@
   <!ENTITY libidn-download-http "http://ftp.gnu.org/gnu/libidn/libidn-&libidn-version;.tar.gz">
   <!ENTITY libidn-download-ftp  "ftp://ftp.gnu.org/gnu/libidn/libidn-&libidn-version;.tar.gz">
-  <!ENTITY libidn-md5sum        "45ffabce4b8ca87fe98fe4542668d33d">
-  <!ENTITY libidn-size          "3.2 MB">
+  <!ENTITY libidn-md5sum        "7533d14fbbb6c026a1a9eaa2179ccb69">
+  <!ENTITY libidn-size          "3.3 MB">
   <!ENTITY libidn-buildsize     "24 MB">
   <!ENTITY libidn-time          "0.3 SBU">
 ]>
 
-<sect1 id="libidn" xreflabel="Libidn-&libidn-version;">
+<sect1 id="libidn" xreflabel="libidn-&libidn-version;">
   <?dbhtml filename="libidn.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Libidn-&libidn-version;</title>
+  <title>libidn-&libidn-version;</title>
 
   <indexterm zone="libidn">
@@ -28,8 +28,8 @@
 
   <sect2 role="package">
-    <title>Introduction to Libidn</title>
-
-    <para>
-      <application>Libidn</application> is a package designed for
+    <title>Introduction to libidn</title>
+
+    <para>
+      <application>libidn</application> is a package designed for
       internationalized string handling based on the
       <ulink url="http://www.ietf.org/rfc/rfc3454.txt">Stringprep</ulink>,
@@ -51,24 +51,36 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&libidn-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libidn-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libidn-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libidn-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libidn-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libidn-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&libidn-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libidn-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libidn-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libidn-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libidn-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libidn-time;
+        </para>
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Libidn Dependencies</bridgehead>
+    <bridgehead renderas="sect3">libidn Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -84,13 +96,13 @@
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libidn"/></para>
-
+      <ulink url="&blfs-wiki;/libidn"/>
+    </para>
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of Libidn</title>
-
-    <para>
-      Install <application>Libidn</application> by running the following
+    <title>Installation of libidn</title>
+
+    <para>
+      Install <application>libidn</application> by running the following
       commands:
     </para>
Index: general/genlib/libxml2.xml
===================================================================
--- general/genlib/libxml2.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/genlib/libxml2.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -118,5 +118,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static --with-history &amp;&amp;
 make</userinput></screen>
 
@@ -139,5 +139,5 @@
 
     <para>
-      <option>--with-history</option>: If this switch is used, it enables
+      <option>--with-history</option>: This switch enables
       <application>Readline</application> support when running
       <command>xmlcatalog</command> or <command>xmllint</command> in shell mode.
Index: general/genlib/openobex.xml
===================================================================
--- general/genlib/openobex.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/genlib/openobex.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -7,6 +7,6 @@
   <!ENTITY openobex-download-http "&sourceforge-repo;/openobex/openobex-&openobex-version;-Source.tar.gz">
   <!ENTITY openobex-download-ftp  " ">
-  <!ENTITY openobex-md5sum        "485734c0e5a6c4a7bd697a0989b67a56">
-  <!ENTITY openobex-size          "696 KB">
+  <!ENTITY openobex-md5sum        "11031f6f0b876bb6259bd27106491528">
+  <!ENTITY openobex-size          "128 KB">
   <!ENTITY openobex-buildsize     "5.0 MB">
   <!ENTITY openobex-time          "0.1 SBU">
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -76,10 +76,14 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="bluez"/> and
-      <xref linkend="libusb-compat"/>
+      <xref linkend="bluez"/>,
+      <xref linkend="cmake"/> and
+      <xref linkend="libusb"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="doxygen"/>,
+      <xref linkend="libxslt"/>,
+      <xref linkend="openjdk"/> and
       <xref linkend="xmlto"/>
     </para>
@@ -98,5 +102,11 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_INSTALL_LIBDIR=lib  \
+      -DCMAKE_BUILD_TYPE=Release  \
+      -DCMAKE_INSTALL_CMAKEBASEDIR=/usr/lib/cmake \
+      .. &amp;&amp;
 make</userinput></screen>
 
@@ -115,6 +125,8 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
+    <para>
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
+      to apply higher level of the compiler optimizations.
+    </para>
 
   </sect2>
Index: general/genutils/desktop-file-utils.xml
===================================================================
--- general/genutils/desktop-file-utils.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/genutils/desktop-file-utils.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -34,5 +34,5 @@
       The <application>Desktop File Utils</application> package contains
       command line utilities for working with <ulink
-      url="http://www.freedesktop.org/Standards/desktop-entry-spec">
+      url="http://standards.freedesktop.org/desktop-entry-spec/latest/">
       Desktop entries</ulink>. These utilities are used by Desktop
       Environments and other applications to manipulate the MIME-types
@@ -125,9 +125,9 @@
       <para>
         The <ulink
-        url="http://freedesktop.org/wiki/Standards/basedir-spec">XDG Base
-        Directory</ulink> specification defines the standard locations for
-        applications to place data and configuration files. These files can
-        be used, for instance, to define the menu structure and menu items
-        in a desktop environment.
+        url="http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html">XDG
+        Base Directory</ulink> specification defines the standard locations for
+        applications to place data and configuration files. These files can be
+        used, for instance, to define the menu structure and menu items in a
+        desktop environment.
       </para>
 
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/genutils/imagemagick.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "8">
+  <!ENTITY imagemagick-patch-version "6">
   <!-- Not sure what to do here as ImageMagick is one of the fastest-moving
        targets in all of open-source. One solution is to always use the last
@@ -16,8 +16,8 @@
   <!ENTITY imagemagick-download-http " ">
   <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
-  <!ENTITY imagemagick-md5sum        "c90d99ce0f0e08ebeab568eda7eedec7">
-  <!ENTITY imagemagick-size          "8.3 MB">
-  <!ENTITY imagemagick-buildsize     "450 MB (full build with all dependencies)">
-  <!ENTITY imagemagick-time          "5.0 SBU (full build - additional 20 SBU to run the test suite)">
+  <!ENTITY imagemagick-md5sum        "d2d03e8131722a5b85fc2a866d9df517">
+  <!ENTITY imagemagick-size          "7.9 MB">
+  <!ENTITY imagemagick-buildsize     "208 MB (with typical dependencies, reputedly 450 MB with all dependencies)">
+  <!ENTITY imagemagick-time          "1.9 SBU (typical build - additional 20 SBU to run the test suite)">
 ]>
 
@@ -29,4 +29,6 @@
 
      Marked as 'typical' because nobody builds ALL the optional extras [ken]
+     Saved the "full" 450MB as a comment - feel free to update this iff you
+     do build all dependencies, it's probably a lot bigger now.
 
      Also, please look over the output from the configure command for any
@@ -60,5 +62,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -133,5 +135,5 @@
       (you'll have to do some hacking to use <application>GnuPG</application>),
       <xref linkend="sane"/>,
-      <ulink url="http://ufraw.sourceforge.net/">ufraw</ulink> (only for raw formats listed in
+      <ulink url="http://ufraw.sourceforge.net/">ufraw</ulink> (for raw formats listed in
       <filename>www/formats.html</filename>),
       <xref linkend="wget"/>, and
Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/genutils/pinentry.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -7,8 +7,8 @@
   <!ENTITY pinentry-download-http " ">
   <!ENTITY pinentry-download-ftp  "ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-&pinentry-version;.tar.bz2">
-  <!ENTITY pinentry-md5sum        "82e6114e5e27a8ab36f314b332a6e024">
+  <!ENTITY pinentry-md5sum        "2ae681cbca0d9fb774b2c90b11ebf56c">
   <!ENTITY pinentry-size          "424 KB">
-  <!ENTITY pinentry-buildsize     "4.7 MB">
-  <!ENTITY pinentry-time          "less than 0.1 SBU">
+  <!ENTITY pinentry-buildsize     "12 MB">
+  <!ENTITY pinentry-time          "0.2 SBU">
 ]>
 
@@ -27,5 +27,4 @@
   </indexterm>
 
-  <!--Required section-->
   <sect2 role="package">
     <title>Introduction to PIN-Entry</title>
@@ -40,8 +39,8 @@
     environments, including interfaces designed for
     <application>Ncurses</application> (text-based),
-    <application>Gtk+</application>, <application>Gtk+-2</application>,
-    <application>Qt-3</application>, and <application>Qt-4</application>.</para>
-
-    &lfs72_checked;
+    <application>GTK+</application>, <application>GTK+2</application>,
+    <application>Qt3</application>, and <application>Qt4</application>.</para>
+
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -67,19 +66,12 @@
     </itemizedlist>
 
-    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/pinentry-&pinentry-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist> -->
-
     <bridgehead renderas="sect3">PIN-Entry Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><!-- <xref linkend="GTK"/>, -->
-    <xref linkend="gtk2"/>,
-    <xref linkend="qt"/>, and
-    <xref linkend="libcap2"/></para>
+    <para role="optional">
+      <xref linkend="gtk2"/>,
+      <xref linkend="libcap2"/> and
+      <xref linkend="qt"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -126,14 +118,4 @@
 
   </sect2>
-
-  <!-- <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>-disable-...</parameter>: These three parameters are used
-    to fix a problem with the <command>configure</command> script if the
-    optional dependencies are not installed. If the dependencies are installed,
-    these parameters may be omitted.</para>
-
-  </sect2> -->
 
   <sect2 role="content">
@@ -183,5 +165,5 @@
         <term><command>pinentry-gtk</command></term>
         <listitem>
-          <para> is a <application>Gtk</application> GUI
+          <para> is a <application>GTK+</application> GUI
           <application>PIN-Entry</application> program.</para>
           <indexterm zone="pinentry pinentry-gtk">
@@ -194,5 +176,5 @@
         <term><command>pinentry-gtk-2</command></term>
         <listitem>
-          <para> is a <application>Gtk-2</application> GUI
+          <para> is a <application>GTK+2</application> GUI
           <application>PIN-Entry</application> program.</para>
           <indexterm zone="pinentry pinentry-gtk-2">
@@ -205,5 +187,5 @@
         <term><command>pinentry-qt</command></term>
         <listitem>
-          <para> is a <application>Qt-3</application> GUI
+          <para> is a <application>Qt3</application> GUI
           <application>PIN-Entry</application> program.</para>
           <indexterm zone="pinentry pinentry-qt">
@@ -216,5 +198,5 @@
         <term><command>pinentry-qt4</command></term>
         <listitem>
-          <para> is a <application>Qt-4</application> GUI
+          <para> is a <application>Qt4</application> GUI
           <application>PIN-Entry</application> program.</para>
           <indexterm zone="pinentry pinentry-qt4">
Index: general/genutils/screen.xml
===================================================================
--- general/genutils/screen.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/genutils/screen.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -81,5 +81,5 @@
 <screen><userinput>./configure --prefix=/usr                     \
             --with-socket-dir=/var/run/screen \
-            --with-pty-group=4                \
+            --with-pty-group=5                \
             --with-sys-screenrc=/etc/screenrc                    &amp;&amp;
 sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%" {etc,doc}/* &amp;&amp;
@@ -105,10 +105,10 @@
     class='directory'>/etc</filename>.  </para>
 
-    <para><parameter>--with-pty-group=4 </parameter>: This option sets the gid
+    <para><parameter>--with-pty-group=5</parameter>: This option sets the gid
     to the value used by LFS.</para>
 
-    <note><para>Newer versions of LFS use the value 5 for the tty group.  If
-    you are using the development version of LFS, change the pty-group option
-    to 5.</para></note>
+    <note><para>Older versions of LFS use the value 4 for the tty group. If
+    you are using LFS version 7.1 or older, change the pty-group option
+    to 4.</para></note>
 
     <para><command>sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%"
Index: general/genutils/tidy.xml
===================================================================
--- general/genutils/tidy.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/genutils/tidy.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -83,5 +83,5 @@
     running the following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -106,4 +106,12 @@
     the <filename class='directory'>api</filename> directory to
     <filename class='directory'>/usr/share/doc/tidy-&tidy-version;.</filename></para>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -141,5 +149,5 @@
     <seglistitem>
     <seg>tab2space and tidy</seg>
-    <seg>libtidy.{so,a}</seg>
+    <seg>libtidy.so</seg>
     <seg>/usr/share/doc/tidy-&tidy-version;</seg>
     </seglistitem>
@@ -173,11 +181,11 @@
 
       <varlistentry id="libtidy">
-        <term><filename class='libraryfile'>libtidy.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libtidy.so</filename></term>
         <listitem>
-          <para>libraries provide the <application>HTML Tidy</application> API
+          <para>library provides the <application>HTML Tidy</application> API
           functions to <command>tidy</command> and can also be called by other
           programs.</para>
           <indexterm zone="html-tidy libtidy">
-            <primary sortas="c-libtidy">libtidy.{so,a}</primary>
+            <primary sortas="c-libtidy">libtidy.so</primary>
           </indexterm>
         </listitem>
Index: general/graphlib/freetype2.xml
===================================================================
--- general/graphlib/freetype2.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/graphlib/freetype2.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -123,6 +123,10 @@
     </para>
 
-<screen><userinput>sed -i -r 's:.*(#.*SUBPIXEL.*) .*:\1:' \
-          include/freetype/config/ftoption.h &amp;&amp;
+<screen><userinput>sed -e "s@FT_CFF_HINTING_FREETYPE@FT_CFF_HINTING_ADOBE@" \
+    -i src/cff/cffobjs.c &amp;&amp;
+sed -e "/AUX.*.gxvalid/s@^# @@" -e "/AUX.*.otvalid/s@^# @@" \
+    -i modules.cfg &amp;&amp;
+sed -e "/#.*.SUBPIXEL/s@/\* @@" -e "/#.*.SUBPIXEL/s@ \*/@@" \
+    -i include/freetype/config/ftoption.h &amp;&amp;
 ./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
@@ -146,9 +150,9 @@
 
     <para>
-      <command>sed -i -r 's:.*(#.*SUBPIXEL.*) .*:\1:'
-      include/freetype/config/ftoption.h</command>:
-      This command enables LCD optimized rendering. This option results in improved
-      rendering of fonts, but may have patent restrictions. Be sure to read the
-      <literal>'Other patent issues'</literal> part of
+      <command>sed -e ...</command>: First command enables Adobe CFF Engine,
+      second command enables GX/AAT and OpenType table validation and third
+      command enables Subpixel Rendering and Subpixel Hinting in order to
+      improve font rendering. Note that Subpixel Rendering has patent issues.
+      Be sure to read the <literal>'Other patent issues'</literal> part of
       <ulink url="http://www.freetype.org/patents.html"/> before enabling this
       option.
Index: general/graphlib/imlib2.xml
===================================================================
--- general/graphlib/imlib2.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/graphlib/imlib2.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -33,5 +33,5 @@
     loading, saving, rendering and manipulation.</para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/graphlib/poppler.xml
===================================================================
--- general/graphlib/poppler.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/graphlib/poppler.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -8,5 +8,5 @@
            "http://poppler.freedesktop.org/poppler-&poppler-version;.tar.gz">
   <!ENTITY poppler-download-ftp       " ">
-  <!ENTITY poppler-md5sum             "be915388eaad6865cee5a156c8119ec1">
+  <!ENTITY poppler-md5sum             "49d55921ce795778c7231fe9f2fe923b">
   <!ENTITY poppler-size               "2.2 MB">
   <!ENTITY poppler-buildsize          "135 MB (excluding the encoding data) and
Index: general/graphlib/qpdf.xml
===================================================================
--- general/graphlib/qpdf.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/graphlib/qpdf.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -7,7 +7,7 @@
   <!ENTITY qpdf-download-http "&sourceforge-repo;/qpdf/qpdf-&qpdf-version;.tar.gz">
   <!ENTITY qpdf-download-ftp  " ">
-  <!ENTITY qpdf-md5sum        "093baece867a0a7e07774bd4008156b3">
+  <!ENTITY qpdf-md5sum        "eedd61acc53744446d181429651a9baf">
   <!ENTITY qpdf-size          "4.9 MB">
-  <!ENTITY qpdf-buildsize     "75 MB">
+  <!ENTITY qpdf-buildsize     "80 MB">
   <!ENTITY qpdf-time          "0.6 SBU">
 ]>
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/prog/cmake.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -7,7 +7,7 @@
   <!ENTITY cmake-download-http "http://www.cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "097278785da7182ec0aea8769d06860c">
-  <!ENTITY cmake-size          "5.6 MB">
-  <!ENTITY cmake-buildsize     "255 MB (including tests)">
+  <!ENTITY cmake-md5sum        "be6008f2299613d23fe82ab53ef7472e">
+  <!ENTITY cmake-size          "5.7 MB">
+  <!ENTITY cmake-buildsize     "275 MB (including tests)">
   <!ENTITY cmake-time          "1.9 SBU (additional 3.1 SBU for the test suite)">
 ]>
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/prog/doxygen.xml
===================================================================
--- general/prog/doxygen.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/prog/doxygen.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -7,7 +7,7 @@
   <!ENTITY doxygen-download-http "http://ftp.stack.nl/pub/doxygen/doxygen-&doxygen-version;.src.tar.gz">
   <!ENTITY doxygen-download-ftp  "ftp://ftp.stack.nl/pub/doxygen/doxygen-&doxygen-version;.src.tar.gz">
-  <!ENTITY doxygen-md5sum        "31b0aaab51c5cab7db9f0ebbe9f85530">
-  <!ENTITY doxygen-size          "6.0 MB">
-  <!ENTITY doxygen-buildsize     "86 MB">
+  <!ENTITY doxygen-md5sum        "5f460b91c0d8c34a76173cf22015c2fc">
+  <!ENTITY doxygen-size          "6.2 MB">
+  <!ENTITY doxygen-buildsize     "90 MB">
   <!ENTITY doxygen-time          "1.4 SBU (includes building the GUI frontend and all docs)">
 ]>
Index: general/prog/python2.xml
===================================================================
--- general/prog/python2.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/prog/python2.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -10,6 +10,6 @@
   <!ENTITY python2-md5sum        "5eea8462f69ab1369d32f9c4cd6272ab">
   <!ENTITY python2-size          "9.8 MB">
-  <!ENTITY python2-buildsize     "235 MB (not including the test suite)">
-  <!ENTITY python2-time          "1.0 SBU (not including the test suite)">
+  <!ENTITY python2-buildsize     "235 MB">
+  <!ENTITY python2-time          "1.0 SBU">
 
   <!ENTITY python2htmldoc-download-http
@@ -160,5 +160,5 @@
     </para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/python-&python2-version; &amp;&amp;
+<screen role="root"><userinput>install -v -dm755 /usr/share/doc/python-&python2-version; &amp;&amp;
 tar --strip-components=1 -C /usr/share/doc/python-&python2-version; \
     -xvf ../python-&python2-version;-docs-html.tar.bz2                      &amp;&amp;
Index: general/prog/python3.xml
===================================================================
--- general/prog/python3.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/prog/python3.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -8,13 +8,13 @@
            "http://www.python.org/ftp/python/&python3-version;/Python-&python3-version;.tar.xz">
   <!ENTITY python3-download-ftp  " ">
-  <!ENTITY python3-md5sum        "993232d9f4d9b4863cc1ec69a792e9cd">
+  <!ENTITY python3-md5sum        "c94b78ea3b68a9bbc9906af4d5b4fdc7">
   <!ENTITY python3-size          "12 MB">
-  <!ENTITY python3-buildsize     "260 MB (not including the testsuite)">
-  <!ENTITY python3-time          "1.2 SBU (not including the testsuite)">
+  <!ENTITY python3-buildsize     "260 MB">
+  <!ENTITY python3-time          "0.9 SBU">
 
   <!ENTITY python3htmldoc-download-http
            "http://docs.python.org/ftp/python/doc/&python3-version;/python-&python3-version;-docs-html.tar.bz2">
-  <!ENTITY python3htmldoc-md5sum        "e730def6cc4d6dddb076aae82661b6d6">
-  <!ENTITY python3htmldoc-size          "4.6 MB">
+  <!ENTITY python3htmldoc-md5sum        "b5eee2b290338fb08c1512bfc79bb999">
+  <!ENTITY python3htmldoc-size          "4.7 MB">
 ]>
 
@@ -134,6 +134,5 @@
     </para>
 
-<screen><userinput>sed "s@\"\$CFLAGS -Werror\"@\"\$CFLAGS -Werror -Wformat\"@g" -i configure &amp;&amp;
-./configure --prefix=/usr       \
+<screen><userinput>./configure --prefix=/usr       \
             --enable-shared     \
             --with-system-expat \
@@ -159,5 +158,5 @@
     </para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/python-&python3-version;/html &amp;&amp;
+<screen role="root"><userinput>install -v -dm755 /usr/share/doc/python-&python3-version;/html &amp;&amp;
 tar --strip-components=1 \
     --no-same-owner \
@@ -170,10 +169,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>sed "s@\"\$CFLAGS -Werror\"@\"\$CFLAGS -Werror -Wformat\"@g"
-      -i configure</command>: Fixes building with
-      <application>GCC</application> 4.8.
-    </para>
 
     <para>
Index: general/prog/ruby.xml
===================================================================
--- general/prog/ruby.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/prog/ruby.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -7,7 +7,7 @@
   <!ENTITY ruby-download-http " ">
   <!ENTITY ruby-download-ftp  "ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-&ruby-version;.tar.bz2">
-  <!ENTITY ruby-md5sum        "a810d64e2255179d2f334eb61fb8519c">
+  <!ENTITY ruby-md5sum        "c2b2de5ef15ea9b1aaa3152f9112af1b">
   <!ENTITY ruby-size          "9.6 MB">
-  <!ENTITY ruby-buildsize     "940 MB">
+  <!ENTITY ruby-buildsize     "890 MB">
   <!ENTITY ruby-time          "4.0 SBU">
 ]>
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/prog/subversion.xml
===================================================================
--- general/prog/subversion.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/prog/subversion.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -93,5 +93,5 @@
       <xref linkend="apr-util"/> and
       <xref linkend="neon"/> or
-      <ulink url="http://code.google.com/p/serf/">serf</ulink>.
+      <ulink url="http://code.google.com/p/serf/">serf</ulink>
     </para>
 
@@ -111,6 +111,6 @@
       <xref linkend="dbus-glib"/>,
       <xref linkend="gnome-keyring"/>,
-      KWallet from KDE and
-      <xref linkend="apache"/>.
+      <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support) and
+      <xref linkend="apache"/>
     </para>
 
@@ -126,5 +126,5 @@
     <para role="optional">
       <ulink url="http://www.swig.org">SWIG</ulink> and
-      <xref linkend="python2"/>.
+      <xref linkend="python2"/>
     </para>
 
@@ -171,5 +171,5 @@
     </para>
 
-<screen><userinput>sed -i 's#Makefile.PL.in$#&amp; libsvn_swig_perl#' Makefile.in &amp;&amp;</userinput></screen>
+<screen><userinput>sed -i 's#Makefile.PL.in$#&amp; libsvn_swig_perl#' Makefile.in</userinput></screen>
 
     <para>
@@ -245,8 +245,6 @@
     <title>Command Explanations</title>
 
-    <para>
-      <option>--disable-static</option>: This stops it installing static
-      versions of the libraries.
-    </para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
 <!--    <para>
Index: general/sysutils/colord.xml
===================================================================
--- general/sysutils/colord.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/sysutils/colord.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -8,8 +8,8 @@
            "http://www.freedesktop.org/software/colord/releases/colord-&colord-version;.tar.xz">
   <!ENTITY colord-download-ftp  " ">
-  <!ENTITY colord-md5sum        "a14bea627172cb8d3aed3c3d22dea085">
+  <!ENTITY colord-md5sum        "5b0c442a2a87c3688b17e1547452ffcb">
   <!ENTITY colord-size          "1.1 MB">
-  <!ENTITY colord-buildsize     "32 MB">
-  <!ENTITY colord-time          "0.3 SBU">
+  <!ENTITY colord-buildsize     "35 MB">
+  <!ENTITY colord-time          "0.4 SBU">
 ]>
 
Index: general/sysutils/sg3_utils.xml
===================================================================
--- general/sysutils/sg3_utils.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/sysutils/sg3_utils.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/sysutils/udisks.xml
===================================================================
--- general/sysutils/udisks.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/sysutils/udisks.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/sysutils/unrar.xml
===================================================================
--- general/sysutils/unrar.xml	(revision 4af4be4a4af4ea98c868c5f0ef7866ebb2ca843b)
+++ general/sysutils/unrar.xml	(revision dcdde936a4754d243233e835e9664ef60c324da9)
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
