Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 8711c09778c556fa4eafa36fec45b4e55325ce15)
+++ general/genutils/imagemagick.xml	(revision 43b178b10adf76d45611a577cf30c14af4ae7200)
@@ -5,12 +5,12 @@
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "3">
+  <!ENTITY imagemagick-patch-version "8">
 
   <!ENTITY imagemagick-download-http "https://www.imagemagick.org/download/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
   <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
-  <!ENTITY imagemagick-md5sum        "94ccdcf91ce0a156ca5335fbc16536b1">
+  <!ENTITY imagemagick-md5sum        "b0a7821fdc789bfa29f5f49070331be2">
   <!ENTITY imagemagick-size          "7.9 MB">
-  <!ENTITY imagemagick-buildsize     "141 MB, with typical dependencies">
-  <!ENTITY imagemagick-time          "2.6 SBU - typical build (add 1.1 SBU for the the validation suite)">
+  <!ENTITY imagemagick-buildsize     "184 MB, with typical dependencies">
+  <!ENTITY imagemagick-time          "2.6 SBU - typical build (add 3.2 SBU for the the validation suite)">
 ]>
 
@@ -19,9 +19,13 @@
      delegate dependencies, you will see a smaller buildsize, but what is
      currently listed above is the space one would require if all the
-     dependencies are installed, which is what we want.
+     dependencies available in the book are installed.
 
      Marked as 'typical' because nobody builds ALL the optional extras [ken]
    
      [bdubbs] I do; at least the internal ones.  I still got only 141 MB.
+
+     [pierre 2017-02-14, v7.0.4-8]. I did too, and got 184 MB. I added the
+     all the corresponding switches to configure, that may make a difference.
+     All 6733 tests passed.
 
      Saved the "full" 450MB as a comment - feel free to update this iff you
@@ -341,5 +345,5 @@
           /usr/include/ImageMagick-7,
           /usr/lib/ImageMagick-&imagemagick-version;,
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/$(uname -m)-linux/{,auto}/Image/Magick,
+          /usr/lib/perl5/site_perl/&lfs-perl-version;/{,auto}/Image/Magick,
           /usr/share/doc/ImageMagick-&imagemagick-version;, and
           /usr/share/ImageMagick-7
@@ -475,5 +479,4 @@
     </varlistentry>
 
-    <!-- the following does not validate
     <varlistentry id="perlmagick">
       <term><filename class='libraryfile'>Image::Magick</filename></term>
@@ -516,5 +519,5 @@
     </varlistentry>
 
-    <varlistentry id="libMagick++-7.Q16HDRI">
+    <varlistentry id="libMagickpp-7.Q16HDRI">
       <term><filename class="libraryfile">libMagick++-7.Q16HDRI.so</filename></term>
       <listitem>
@@ -522,9 +525,9 @@
           provides the C++ API for ImageMagick.
         </para>
-        <indexterm zone="imagemagick libMagick++-7.Q16HDRI">
+        <indexterm zone="imagemagick libMagickpp-7.Q16HDRI">
           <primary sortas="c-libMagick++-7.Q16HDRI">libMagick++-7.Q16HDRI.so</primary>
         </indexterm>
       </listitem>
-    </varlistentry> -->
+    </varlistentry>
 
     </variablelist>
Index: general/genutils/imagemagick6.xml
===================================================================
--- general/genutils/imagemagick6.xml	(revision 8711c09778c556fa4eafa36fec45b4e55325ce15)
+++ general/genutils/imagemagick6.xml	(revision 43b178b10adf76d45611a577cf30c14af4ae7200)
@@ -5,12 +5,12 @@
   %general-entities;
 
-  <!ENTITY imagemagick6-patch-version "3">
+  <!ENTITY imagemagick6-patch-version "8">
 
   <!ENTITY imagemagick6-download-http "https://www.imagemagick.org/download/releases/ImageMagick-&imagemagick6-version;-&imagemagick6-patch-version;.tar.xz">
   <!ENTITY imagemagick6-download-ftp  "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick6-version;-&imagemagick6-patch-version;.tar.xz">
-  <!ENTITY imagemagick6-md5sum        "d7eff23705183aa307311906a64a1924">
+  <!ENTITY imagemagick6-md5sum        "765ed15348074bc2e45acd6f890016eb">
   <!ENTITY imagemagick6-size          "8.4 MB">
-  <!ENTITY imagemagick6-buildsize     "140 MB, with typical dependencies">
-  <!ENTITY imagemagick6-time          "2.5 SBU - typical build (add 1.3. SBU for the validation suite)">
+  <!ENTITY imagemagick6-buildsize     "179 MB, with typical dependencies">
+  <!ENTITY imagemagick6-time          "2.3 SBU - typical build (add 0.8 SBU for the validation suite)">
 ]>
 
@@ -19,8 +19,12 @@
      delegate dependencies, you will see a smaller buildsize, but what is
      currently listed above is the space one would require if all the
-     dependencies are installed, which is what we want.
+     dependencies available in the book are installed.
+
+     [pierre 2017-02-14]] For a build of 6.9.7-8 with dependencies available in
+     the book, but with the configure command as below, I got 179 MB (2.3 SBU)
+     (and 472 KB (0.8 SBU) for the validation suite).
 
      For a non-full build of 6.9.3-8 I got an actual space of 173 MB and running
-     the validation suite does not increate the net space. I recomment running
+     the validation suite does not increase the net space. I recommend running
      that instead of check (after the install)!
 
@@ -49,6 +53,6 @@
 
   <sect1info>
-    <othername>$LastChangedBy: dj $</othername>
-    <date>$Date: 2016-12-17 06:42:45 +0000 (Sat, 17 Dec 2016) $</date>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
   </sect1info>
 
@@ -366,10 +370,47 @@
     </segmentedlist>
 
-    <!--<variablelist>
+    <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-    </variablelist> -->
+    <varlistentry id="libMagickCore-6.Q16HDRI">
+      <term><filename class="libraryfile">libMagickCore-6.Q16HDRI.so</filename></term>
+      <listitem>
+        <para>
+          provides the C API for ImageMagick.
+        </para>
+        <indexterm zone="imagemagick6 libMagickCore-6.Q16HDRI">
+          <primary sortas="c-libMagickCore-6.Q16HDRI">libMagickCore-6.Q16HDRI.so</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="libMagickWand-6.Q16HDRI">
+      <term><filename class="libraryfile">libMagickWand-6.Q16HDRI.so</filename></term>
+      <listitem>
+        <para>
+          is the recommended C API for ImageMagick. Unlike the MagickCore API it
+          uses  only a few opaque types.
+        </para>
+        <indexterm zone="imagemagick6 libMagickWand-6.Q16HDRI">
+          <primary sortas="c-libMagickWand-6.Q16HDRI">libMagickWand-6.Q16HDRI.so</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="libMagickpp-6.Q16HDRI">
+      <term><filename class="libraryfile">libMagick++-6.Q16HDRI.so</filename></term>
+      <listitem>
+        <para>
+          provides the C++ API for ImageMagick.
+        </para>
+        <indexterm zone="imagemagick6 libMagickpp-6.Q16HDRI">
+          <primary sortas="c-libMagick++-6.Q16HDRI">libMagick++-6.Q16HDRI.so</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    </variablelist>
 
   </sect2>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 8711c09778c556fa4eafa36fec45b4e55325ce15)
+++ introduction/welcome/changelog.xml	(revision 43b178b10adf76d45611a577cf30c14af4ae7200)
@@ -46,4 +46,19 @@
       <itemizedlist>
         <listitem>
+          <para>[pierre] - Update to ImageMagick-7.0.4-8. Keep
+          <ulink url="&blfs-ticket-root;7859">#7859</ulink> open, since
+          releases occur very often.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to ImageMagick-6.9.7-8. Keep
+          <ulink url="&blfs-ticket-root;7859">#7859</ulink> open, since
+          releases occur very often.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to x264-20170212-2245. Keep
+          <ulink url="&blfs-ticket-root;7555">#7555</ulink> open, since there
+          are daily releases.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Update to Guile-2.0.14. Fixes
           <ulink url="&blfs-ticket-root;8876">#8876</ulink>.</para>
Index: multimedia/libdriv/x264.xml
===================================================================
--- multimedia/libdriv/x264.xml	(revision 8711c09778c556fa4eafa36fec45b4e55325ce15)
+++ multimedia/libdriv/x264.xml	(revision 43b178b10adf76d45611a577cf30c14af4ae7200)
@@ -7,7 +7,7 @@
   <!ENTITY x264-download-http "http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-&x264-version;-stable.tar.bz2 ">
   <!ENTITY x264-download-ftp  " ">
-  <!ENTITY x264-md5sum        "f60b982df885c884255748128848516b">
-  <!ENTITY x264-size          "716 KB">
-  <!ENTITY x264-buildsize     "8.4 MB">
+  <!ENTITY x264-md5sum        "127ade6bafce9f6d522e1c214156f4ed">
+  <!ENTITY x264-size          "717 KB">
+  <!ENTITY x264-buildsize     "9.7 MB">
   <!ENTITY x264-time          "0.2 SBU">
 ]>
Index: packages.ent
===================================================================
--- packages.ent	(revision 8711c09778c556fa4eafa36fec45b4e55325ce15)
+++ packages.ent	(revision 43b178b10adf76d45611a577cf30c14af4ae7200)
@@ -784,5 +784,5 @@
 <!ENTITY taglib-version               "1.11.1">
 <!ENTITY v4l-utils-version            "1.12.2">
-<!ENTITY x264-version                 "20160827-2245">
+<!ENTITY x264-version                 "20170212-2245">
 <!ENTITY x265-version                 "2.2">
 <!ENTITY xine-lib-version             "1.2.6">
