diff --git a/general/genutils/imagemagick.xml b/general/genutils/imagemagick.xml
index c54e1cdb81..bc08eb1a13 100644
--- a/general/genutils/imagemagick.xml
+++ b/general/genutils/imagemagick.xml
@@ -4,14 +4,14 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "5">
+  <!ENTITY imagemagick-patch-version "1">
 
   <!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        "af1c85b8b8f817e919f9ca4408d86782">
-  <!ENTITY imagemagick-size          "8.4 MB">
-  <!ENTITY imagemagick-buildsize     "193 MB, with typical dependencies (222 MB with the test suite, reputedly 450 MB with all dependencies)">
-  <!ENTITY imagemagick-time          "2.0 SBU - typical build (additional 1.6 SBU to run the test suite and 1.4 SBU to run the validation suite)">
+  <!ENTITY imagemagick-md5sum        "24673d00fcc8aa00313eeca6aa20fd3c">
+  <!ENTITY imagemagick-size          "7.9 MB">
+  <!ENTITY imagemagick-buildsize     "200 MB, with typical dependencies (add 31 MB for the test suite)">
+  <!ENTITY imagemagick-time          "2.9 SBU - typical build (add 1.8 SBU for the test suite and 1.5 SBU for the validation suite)">
 ]>
 
 <!-- Editors: It is highly unlikely that the buildsize (disk space used) will
@@ -21,9 +21,14 @@
      dependencies are installed, which is what we want.
 
      Marked as 'typical' because nobody builds ALL the optional extras [ken]
+   
+     [bdubbs] I do; at least the internal ones.  I still got only 200 MB.
+
      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.
 
+     [bdubbs] Just removed it.  I don't think it adds anything.
+
      Also, please look over the output from the configure command for any
      additional dependencies that need to be listed, as ImageMagick is
      constantly adding additional features and dependencies.
@@ -58,6 +63,7 @@
     </para>
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -157,6 +163,7 @@
       <ulink url="http://djvu.sourceforge.net/">DjVuLibre</ulink>,
       <ulink url="ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/">
       FlashPIX (libfpx)</ulink>,
+      <ulink url="https://github.com/FLIF-hub/FLIF/releases">FLIF</ulink>,
       <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>,
       <ulink url="&gnome-download-http;/libgxps/">libgxps</ulink>,
       <ulink url="https://github.com/HOST-Oman/libraqm/">libraqm</ulink>,
@@ -210,7 +217,9 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr     \
+<screen><userinput>sed -i '/seems to be moved/ s/^/true #/' config/ltmain.sh &amp;&amp;
+
+./configure --prefix=/usr     \
             --sysconfdir=/etc \
             --enable-hdri     \
             --with-modules    \
@@ -244,6 +253,10 @@ make</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para>
+      <command>sed ...</command>: Removes a lot of invalid warnings.
+    </para>
+
     <para>
       <parameter>--enable-hdri</parameter>: Enables building of a
       high dynamic range version of ImageMagick.
@@ -320,22 +333,23 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>
-          animate, compare, composite, conjure, convert, display,
-          identify, import, Magick-config, Magick++-config, MagickCore-config,
-          MagickWand-config, mogrify, montage, stream, and Wand-config
+          magick, Magick++-config, MagickCore-config, and MagickWand-config.
+          (animate, compare, composite, conjure, convert, display,
+          identify, import, magick-script, mogrify, montage, and stream
+          are all symbolic links to magick)
         </seg>
         <seg>
-          libMagickCore-6.Q16HDRI.so,
-          libMagickWand-6.Q16HDRI.so and
-          libMagick++-6.Q16HDRI.so
+          libMagickCore-7.Q16HDRI.so,
+          libMagickWand-7.Q16HDRI.so and
+          libMagick++-7.Q16HDRI.so
         </seg>
         <seg>
-          /etc/ImageMagick-6,
-          /usr/include/ImageMagick-6,
+          /etc/ImageMagick-7,
+          /usr/include/ImageMagick-7,
           /usr/lib/ImageMagick-&imagemagick-version;,
-          /usr/lib/perl5/site_perl/&lfs-perl-version;/{,auto}/Image/Magick,
+          /usr/lib/perl5/site_perl/&lfs-perl-version;/$(uname -m)-linux/{,auto}/Image/Magick,
           /usr/share/doc/ImageMagick-&imagemagick-version;, and
-          /usr/share/ImageMagick-6
+          /usr/share/ImageMagick-7
         </seg>
       </seglistitem>
     </segmentedlist>
@@ -426,7 +440,7 @@ make</userinput></screen>
     </varlistentry>
 
     <varlistentry id="magick-config">
-      <term><command>Magick{,++,Core,Wand}-config</command></term>
+      <term><command>Magick{++,Core,Wand}-config</command></term>
       <listitem>
         <para>show information about the installed versions of the
         <application>ImageMagick</application> libraries.</para>
@@ -467,16 +481,6 @@ make</userinput></screen>
       </listitem>
     </varlistentry>
 
-    <varlistentry id="wand-config">
-      <term><command>Wand-config</command></term>
-      <listitem>
-        <para>shows the options required to use the Wand library.</para>
-        <indexterm zone="imagemagick wand-config">
-          <primary sortas="b-Wand-config">Wand-config</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
     <varlistentry id="perlmagick">
       <term><filename class='libraryfile'>Image::Magick</filename></term>
       <listitem>
diff --git a/general/sysutils/obex-data-server.xml b/general/sysutils/obex-data-server.xml
index cbd1960457..0e4b31e420 100644
--- a/general/sysutils/obex-data-server.xml
+++ b/general/sysutils/obex-data-server.xml
@@ -35,6 +35,7 @@
     </para>
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index fd44e72c6c..35803f7a5f 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -46,6 +46,11 @@
     <listitem>
       <para>May 6th, 2016</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to ImageMagick-7.0.1-1. 
+            Fixes
+          <ulink url="&blfs-ticket-root;7520">#7520</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Added ENTITY gcc8_checked to aid 
           transition to gcc-6.1.0.</para>
diff --git a/multimedia/libdriv/xine-lib.xml b/multimedia/libdriv/xine-lib.xml
index b21c0463f0..7878dc4077 100644
--- a/multimedia/libdriv/xine-lib.xml
+++ b/multimedia/libdriv/xine-lib.xml
@@ -39,6 +39,7 @@
     </para>
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -127,7 +128,10 @@
 <screen><userinput>sed -e 's/avcodec_alloc_frame/av_frame_alloc/'            \
         -e 's/avcodec_free_frame/av_frame_free/'          \
         -i src/combined/ffmpeg/ff_{audio,video}_decoder.c \
-           src/dxr3/ffmpeg_encoder.c
+           src/dxr3/ffmpeg_encoder.c &amp;&amp;
+
+sed -e 's|wand/magick_wand.h|MagickWand/MagickWand.h|' \
+    -i src/video_dec/image.c &amp;&amp;
 
 ./configure --prefix=/usr          \
             --disable-vcd          \
@@ -168,8 +172,8 @@ install -v -m644    doc/api/* \
     <title>Command Explanations</title>
 
     <para>
-      <command>sed ...</command>: This command enables the package to be 
-      built with <xref linkend='ffmpeg'/>.
+      <command>sed ...</command>: These commands enable the package to be 
+      built with <xref linkend='ffmpeg'/> and <xref linkend='imagemagick'/>.
     </para>
 
     <para>
diff --git a/packages.ent b/packages.ent
index b3358e9d99..69e6d853ac 100644
--- a/packages.ent
+++ b/packages.ent
@@ -201,7 +201,7 @@
 <!ENTITY hd2u-version                 "1.0.3">
 <!ENTITY hicolor-icon-theme-version   "0.15">
 <!ENTITY icon-naming-utils-version    "0.8.90">
-<!ENTITY imagemagick-version          "6.9.3">
+<!ENTITY imagemagick-version          "7.0.1">
 <!ENTITY intltool-version             "0.50.2">
 <!ENTITY lsof-version                 "4.89">
 <!ENTITY pinentry-version             "0.9.7">
diff --git a/postlfs/editors/emacs.xml b/postlfs/editors/emacs.xml
index 4bc73d719e..ef4226092e 100644
--- a/postlfs/editors/emacs.xml
+++ b/postlfs/editors/emacs.xml
@@ -33,6 +33,7 @@
     customizable, self-documenting real-time display editor.</para>
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/pst/printing/gs.xml b/pst/printing/gs.xml
index b5fbe15605..0f36621ccf 100644
--- a/pst/printing/gs.xml
+++ b/pst/printing/gs.xml
@@ -46,6 +46,7 @@
     used for that.</para>
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/pst/printing/gutenprint.xml b/pst/printing/gutenprint.xml
index afa0cafcd5..70a2a51fde 100644
--- a/pst/printing/gutenprint.xml
+++ b/pst/printing/gutenprint.xml
@@ -40,6 +40,7 @@
     </para>
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/xsoft/other/feh.xml b/xsoft/other/feh.xml
index a7cf66464c..fbbf475c4c 100644
--- a/xsoft/other/feh.xml
+++ b/xsoft/other/feh.xml
@@ -40,6 +40,7 @@
     </para>
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/xsoft/other/inkscape.xml b/xsoft/other/inkscape.xml
index 6994ced07f..9fab7d0746 100644
--- a/xsoft/other/inkscape.xml
+++ b/xsoft/other/inkscape.xml
@@ -36,6 +36,7 @@
     </para>
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -156,6 +157,9 @@
 
 <screen><userinput>patch -Np1 -i ../inkscape-&inkscape-version;-testfiles-1.patch &amp;&amp;
 
+sed -e 's/ScopedPtr&lt;char&gt;/make_unique_ptr_gfree/' \
+    -i src/ui/clipboard.cpp  &amp;&amp;
+
 CXXFLAGS="-g -O2 -std=c++11" ./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -176,6 +180,11 @@ make</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para>
+      <command>sed  ... </command>: This <command>sed</command> fixes a 
+      build problem identified upstream.
+    </para>
+
     <para>
       <command>CXXFLAGS="-g -O2 -std=c++11" ./configure...</command>: Inkscape
       has not yet been ported to the 2011 ISO C++ standard, one of its
@@ -185,12 +194,6 @@ make</userinput></screen>
       <envar>CXXFLAGS</envar> together with the default options.
     </para>
 
-    <para>
-      <command>sed -ri ... configure</command>:
-      This <command>sed</command> fixes building problems starting
-      with gc-7.4.2.
-    </para>
-
   </sect2>
 
   <sect2 role="content">
diff --git a/xsoft/other/tigervnc.xml b/xsoft/other/tigervnc.xml
index f0c90e2eca..7cd61330da 100644
--- a/xsoft/other/tigervnc.xml
+++ b/xsoft/other/tigervnc.xml
@@ -37,6 +37,7 @@
     </para>
 
     &lfs79_checked;
+    &gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">