Index: general.ent
===================================================================
--- general.ent	(revision 96a04dffe4d78f5a545746a44b7decaf7bd06a08)
+++ general.ent	(revision e4d2b8dae236dc82ff3c9b7dad7bb05e092999c3)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "06">                   <!-- Always 2 digits -->
+<!ENTITY day          "07">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 6th &year;">
+<!ENTITY releasedate  "June 7th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/graphlib/opencv.xml
===================================================================
--- general/graphlib/opencv.xml	(revision 96a04dffe4d78f5a545746a44b7decaf7bd06a08)
+++ general/graphlib/opencv.xml	(revision e4d2b8dae236dc82ff3c9b7dad7bb05e092999c3)
@@ -174,5 +174,8 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install               &amp;&amp;
+mv -v /usr/share/OpenCV/3rdparty/lib/libippicv.a /usr/lib &amp;&amp;
+rm -rv /usr/share/OpenCV/3rdparty
+</userinput></screen>
 
   </sect2>
@@ -186,4 +189,8 @@
     <para><parameter>-DWITH_IPP=ON</parameter>: This option instructs the make
     procedure to use the downloaded IPP package.</para>
+
+    <para><command>mv -v /usr/share/OpenCV/3rdparty/lib/libippicv.a
+    /usr/lib</command>: This command move a library to a location where it 
+    can be found.</para>
 
   </sect2>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 96a04dffe4d78f5a545746a44b7decaf7bd06a08)
+++ introduction/welcome/changelog.xml	(revision e4d2b8dae236dc82ff3c9b7dad7bb05e092999c3)
@@ -44,4 +44,22 @@
 
 -->
+    <listitem>
+      <para>June 7th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Remove reference to qt4 in avahi
+          and networkmanager.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to vlc-3.0.0-20160606. Fixes 
+          <ulink url="&blfs-ticket-root;7918">#7918</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Move opnecv 3rd party static library to 
+          /usr/lib.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>June 6th, 2016</para>
Index: multimedia/videoutils/vlc.xml
===================================================================
--- multimedia/videoutils/vlc.xml	(revision 96a04dffe4d78f5a545746a44b7decaf7bd06a08)
+++ multimedia/videoutils/vlc.xml	(revision e4d2b8dae236dc82ff3c9b7dad7bb05e092999c3)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY vlc-download-http "http://download.videolan.org/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">
-  <!ENTITY vlc-download-ftp  " ">
-  <!ENTITY vlc-md5sum        "ecbc65be549e5cc83e4cbe0129e66dcd">
-  <!ENTITY vlc-size          "21 MB">
-  <!ENTITY vlc-buildsize     "603 MB (add xx MB for tests)">
-  <!ENTITY vlc-time          "4.6 SBU (add x.y SBU for tests)">
+  <!ENTITY vlc-download-http "&sources-anduin-http;/vlc/vlc-&vlc-version;.tar.xz">
+  <!ENTITY vlc-download-ftp  "&sources-anduin-ftp;/vlc/vlc-&vlc-version;.tar.xz">
+  <!ENTITY vlc-md5sum        "ea02989ea69f8eda65a4dcf73982eed2">
+  <!ENTITY vlc-size          "20 MB">
+  <!ENTITY vlc-buildsize     "673 MB (add 4 MB for tests)">
+  <!ENTITY vlc-time          "6.0 SBU (add 0.2 SBU for tests)">
 ]>
 
@@ -71,15 +71,4 @@
         <para>
           Estimated build time: &vlc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink
-            url="&patch-root;/vlc-&vlc-version;-ffmpeg3-1.patch"/>
         </para>
       </listitem>
@@ -153,5 +142,4 @@
       <ulink url="http://www.videolan.org/developers/libdca.html">libdca</ulink>,
       <ulink url="http://code.google.com/p/libkate/">libkate</ulink>,
-      <!--<ulink url="http://code.google.com/p/libtiger/">libtiger</ulink>,-->
       <ulink url="http://www.khronos.org/openmax/">OpenMAX</ulink>,
       <ulink url="http://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>,
@@ -183,10 +171,7 @@
     <bridgehead renderas="sect4">Optional interface plugins</bridgehead>
     <para role="optional">
-      <xref linkend="qt4"/> (required for the graphical user interface),
-      <xref linkend="qt5"/> (for some plugins, but currently broken with
-      Qt-5.5),
+      <xref linkend="qt5"/> (required for the graphical user interface),
       <ulink url="http://pkgbuild.com/~giovanni/libtar/">libtar</ulink>, and
       <ulink url="http://www.lirc.org/">LIRC</ulink>
-      <!--<ulink url="http://www.feep.net/libtar/">libtar</ulink>-->
     </para>
 
@@ -222,13 +207,4 @@
 
     <para>
-      If both Qt4 and Qt5 are installed, Qt5 needs to be hidden from
-      <envar>PKG_CONFIG_PATH</envar>, due to a bug. Temporarily do it by issuing:
-    </para>
-
-<screen><userinput>SAVEPATH=$PKG_CONFIG_PATH &amp;&amp;
-PKG_CONFIG_PATH="\
-`echo $PKG_CONFIG_PATH | sed 's@:/opt/qt5/lib/pkgconfig@@'`"</userinput></screen>
-
-    <para>
       If you wish to avoid many invalid warnings, issue:
     </para>
@@ -240,9 +216,6 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-ffmpeg3-1.patch &amp;&amp;
-
-CXX="g++ -std=c++11"              \
-CFLAGS="-DLUA_COMPAT_5_1"         \
-OPENCV_LIBS="-L/usr/share/OpenCV" \
+<screen><userinput>BUILDCC=gcc                      \
+CFLAGS="-I $XORG_PREFIX/include" \
 ./configure --prefix=/usr &amp;&amp;
 
@@ -250,14 +223,6 @@
 
     <para>
-      Again, if both Qt4 and 5 are installed, restore
-      <envar>PKG_CONFIG_PATH</envar>:
-    </para>
-
-<screen><userinput>PKG_CONFIG_PATH=$SAVEPATH &amp;&amp;
-unset SAVEPATH</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>. Tests must be
-      run from an active X session. One test fails for unknown reasons.
+      To test the results, issue: <command>make -k check</command>.
+      One test fails for unknown reasons.
     </para>
 
@@ -285,17 +250,12 @@
 
     <para>
-      <envar>CXX="g++ -std=c++11"</envar> This environment variable
+      <envar>BUILDCC=gcc</envar> This environment variable
       is needed for compatibility with <xref linkend='gcc'/>.
     </para>
 
     <para>
-      <envar>CFLAGS="-DLUA_COMPAT_5_1"</envar> This environment variable
-      is needed for compatibilty with <xref linkend='lua'/>.
-    </para>
-
-    <para>
-      <envar>OPENCV_LIBS="-L/usr/share/OpenCV"</envar> This environment variable
-      helps the linker to find <filename>libippicv.a</filename> installed by
-      <application>OpenCV</application> 3.
+      <envar>CFLAGS="-I $XORG_PREFIX/include"</envar> This environment variable
+      is needed if <application>xorg</application> is not installed in 
+      <filename class="directory">/usr</filename>.
     </para>
 
Index: networking/netutils/avahi.xml
===================================================================
--- networking/netutils/avahi.xml	(revision 96a04dffe4d78f5a545746a44b7decaf7bd06a08)
+++ networking/netutils/avahi.xml	(revision e4d2b8dae236dc82ff3c9b7dad7bb05e092999c3)
@@ -89,7 +89,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="dbus-python"/>,
-      <xref linkend="pygtk"/> and
-      <xref linkend="qt4"/>
+      <xref linkend="dbus-python"/> and
+      <xref linkend="pygtk"/> 
     </para>
 
@@ -173,11 +172,12 @@
     <para>
       <parameter>--disable-qt3</parameter>: This parameter disables the
-      building of <application>Qt3</application> mainloop integration.
-    </para>
-
-    <para>
-      <parameter>--disable-qt4</parameter>: This parameter disables the building
-      of <application>Qt4Core</application> mainloop integration. Omit
-      this if you have installed <application>Qt4</application>.
+      attempt to build the obsolete <application>Qt3</application> 
+      portions of the package.
+    </para>
+
+    <para>
+      <parameter>--disable-qt4</parameter>: This parameter disables the
+      attempt to build the obsolete <application>Qt4Core</application> 
+      portions of the package.
     </para>
 
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision 96a04dffe4d78f5a545746a44b7decaf7bd06a08)
+++ networking/netutils/networkmanager.xml	(revision e4d2b8dae236dc82ff3c9b7dad7bb05e092999c3)
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs79_checked;
+    &lfs79_checked;&gcc6_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -106,5 +106,5 @@
       <xref linkend="bluez"/>,
       <xref linkend="gtk-doc"/>,
-      <xref linkend="qt4"/>,
+      <xref linkend="qt5"/> (for examples),
       <xref linkend="valgrind"/>,
       <ulink url="http://libteam.org/">libteam</ulink>, and
@@ -121,4 +121,11 @@
     <title>Installation of NetworkManager</title>
 
+    <para>If <xref linkend="qt5"/> is installed and the Qt based 
+    examples are desired, fix the configure script:</para>
+
+<screen><userinput>sed -e '/Qt[CDN]/s/Qt/Qt5/g'       \
+    -e 's/moc_location/host_bins/' \
+    -i configure</userinput></screen>
+
     <para>
       Install <application>NetworkManager</application> by running the
@@ -126,5 +133,6 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr        \
+<screen><userinput>CXXFLAGS="-O2 -fPIC"             \
+./configure --prefix=/usr        \
             --sysconfdir=/etc    \
             --localstatedir=/var \
@@ -150,4 +158,9 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <envar>CXXFLAGS="-O2 -fPIC"</envar>: These compiler options are 
+      necessary to build the Qt5 based examples.
+    </para>
 
     <para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 96a04dffe4d78f5a545746a44b7decaf7bd06a08)
+++ packages.ent	(revision e4d2b8dae236dc82ff3c9b7dad7bb05e092999c3)
@@ -788,5 +788,5 @@
 <!ENTITY xine-ui-version              "0.99.9">
 <!ENTITY transcode-version            "1.1.7">
-<!ENTITY vlc-version                  "2.2.3">
+<!ENTITY vlc-version                  "3.0.0-20160606">
 
 <!-- Chapter 49 -->
