Index: general.ent
===================================================================
--- general.ent	(revision 233a4949984df8eba1128823a84f856fc4778b48)
+++ general.ent	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
@@ -157,2 +157,8 @@
                           linkend='parallel-builds'/> for more information.</para></note>">
 
+<!-- KF5 entities -->
+<!ENTITY kf5-version       "5.11.0">
+<!ENTITY kf5-base          "5.11">
+<!ENTITY kf5-download-http "http://download.kde.org/stable/frameworks/&kf5-base;"> 
+<!ENTITY kf5-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/frameworks/&kf5-base;">
+
Index: general/prog/tcl.xml
===================================================================
--- general/prog/tcl.xml	(revision 233a4949984df8eba1128823a84f856fc4778b48)
+++ general/prog/tcl.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
@@ -179,10 +179,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <option>--without-tzdata</option>: This switch prevents installation
-      of the shipped timezone data which are older than the ones provided
-      in LFS.
-    </para>
 
     <para>
Index: general/prog/valgrind.xml
===================================================================
--- general/prog/valgrind.xml	(revision 233a4949984df8eba1128823a84f856fc4778b48)
+++ general/prog/valgrind.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
Index: packages.ent
===================================================================
--- packages.ent	(revision 233a4949984df8eba1128823a84f856fc4778b48)
+++ packages.ent	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
@@ -510,4 +510,5 @@
 <!ENTITY kdepim-version               "4.14.9">
 <!ENTITY automoc4-version             "0.9.88">
+<!ENTITY extra-cmake-modules-version  "1.7.0">
 <!ENTITY phonon-version               "4.8.3">
 <!ENTITY phonon-backend-gstreamer-version "4.8.2">
Index: x/lib/qt4.xml
===================================================================
--- x/lib/qt4.xml	(revision 233a4949984df8eba1128823a84f856fc4778b48)
+++ x/lib/qt4.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
@@ -5,6 +5,9 @@
   %general-entities;
 
+  <!ENTITY qt4-major "4.8">
+  <!ENTITY qt4-url   "http://download.qt-project.org/official_releases/qt/&qt4-major;">
+
   <!ENTITY qt4-download-http
-           "http://download.qt-project.org/official_releases/qt/4.8/&qt4-version;/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
+           "&qt4-url;;/&qt4-version;/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
   <!ENTITY qt4-download-ftp  " ">
   <!ENTITY qt4-md5sum        "d990ee66bf7ab0c785589776f35ba6ad">
@@ -29,13 +32,13 @@
 
   <sect2 role="package">
-    <title>Introduction to Qt</title>
-
-    <para>
-      <application>Qt</application> is a cross-platform application
-      framework that is widely used for developing application software
-      with a graphical user interface (GUI) (in which cases Qt is classified
-      as a widget toolkit), and also used for developing non-GUI programs such
-      as command-line tools and consoles for servers. One of the major users
-      of <application>Qt</application> is <application>KDE</application>.
+    <title>Introduction to Qt4</title>
+
+    <para>
+      <application>Qt4</application> is a cross-platform application framework
+      that is widely used for developing application software with a graphical
+      user interface (GUI) (in which cases Qt4 is classified as a widget
+      toolkit), and also used for developing non-GUI programs such as
+      command-line tools and consoles for servers. One of the major users of
+      <application>Qt</application> is <application>KDE4</application>.
     </para>
 
@@ -115,27 +118,17 @@
   </sect2>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../xincludes/qt-alternatives.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+              href="../../xincludes/qt-alternatives.xml"/>
 
   <sect2 role="qt4-prefix">
     <title>Setting the installation prefix</title>
 
-    <bridgehead renderas="sect3">Installing in /usr</bridgehead>
-
-    <para>
-      If you want to install <application>Qt4</application>
-      in <filename class="directory">/usr</filename>, set the
+    <bridgehead renderas="sect3">Installing in /opt/qt4</bridgehead>
+
+    <para>
+      The BLFS editors recommend installing <application>Qt4</application> in a
+      directory other than <filename class="directory">/usr</filename>, ie
+      <filename class="directory">/opt/qt4</filename>.  To do this, set the
       following environment variable:
-    </para>
-
-<screen><userinput>export QT4PREFIX=/usr</userinput></screen>
-
-    <bridgehead renderas="sect3">Installing in /opt/qt4</bridgehead>
-
-    <para>
-      If you want to install <application>Qt4</application>
-      in a directory other than <filename
-      class="directory">/usr</filename>, ie
-      <filename class="directory">/opt/qt4</filename>, set
-      the following environment variable:
     </para>
 
@@ -167,13 +160,5 @@
 
   <sect2 role="installation">
-    <title>Installation of Qt</title>
-
-    <caution>
-      <para>
-        If you did not install some of the recommended dependencies, examine
-        <command>./configure --help</command> output to check how to disable
-        them or use internal versions bundled in the source tarball.
-      </para>
-    </caution>
+    <title>Installation of Qt4</title>
 
     <warning>
@@ -188,43 +173,59 @@
     </warning>
 
+    <caution>
+      <para>
+        If you did not install some of the recommended dependencies, examine
+        <command>./configure --help</command> output to check how to disable
+        them or use internal versions bundled in the source tarball.
+      </para>
+    </caution>
+
     <note>
       <para>
         The build time and space required for the full
-        <application>Qt</application> is quite long. The instructions below
-        do not build the tutorials and examples. Removing the
+        <application>Qt3</application> is quite long. The instructions below do
+        not build the tutorials and examples. Removing the
         <parameter>-nomake</parameter> lines will create a complete build.
       </para>
     </note>
 
-    <para>
-      Install <application>Qt4</application> into the <filename
-      class='directory'>/usr</filename> hierarchy by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure -prefix         $QT4PREFIX                        \
-            -sysconfdir     /etc/xdg                          \
-            -bindir         $QT4BINDIR                        \
-            -plugindir      $QT4PREFIX/lib/qt4/plugins        \
-            -importdir      $QT4PREFIX/lib/qt4/imports        \
-            -headerdir      $QT4PREFIX/include/qt4            \
-            -datadir        $QT4PREFIX/share/qt4              \
-            -docdir         $QT4PREFIX/share/doc/qt4          \
-            -translationdir $QT4PREFIX/share/qt4/translations \
-            -demosdir       $QT4PREFIX/share/doc/qt4/demos    \
-            -examplesdir    $QT4PREFIX/share/doc/qt4/examples \
-            -confirm-license   \
-            -opensource        \
-            -release           \
-            -dbus-linked       \
-            -openssl-linked    \
-            -system-sqlite     \
-            -no-phonon         \
-            -no-phonon-backend \
-            -no-openvg         \
-            -nomake demos      \
-            -nomake examples   \
-            -optimized-qmake   &amp;&amp;
-
+    <note>
+      <para>
+        The BLFS editors do not recommend installing <application>Qt4</application>
+        into the /usr hierarchy because it becomes difficult to find
+        components and to update to a new version.  If you do want to install
+        <application>Qt4</application> in /usr, the directories need to
+        be specified explicitly.  In this case, set QT4PREFIX=/usr and add 
+        the following to the configure arguments below:</para>
+
+        <screen><userinput>-bindir         /usr/bin/qt4                \
+-plugindir      /usr/lib/qt4/plugins        \
+-importdir      /usr/lib/qt4/imports        \
+-headerdir      /usr/include/qt4            \
+-datadir        /usr/share/qt4              \
+-docdir         /usr/share/doc/qt4          \
+-translationdir /usr/share/qt4/translations \
+-demosdir       /usr/share/doc/qt4/demos    \
+-examplesdir    /usr/share/doc/qt4/examples </userinput></screen>
+    </note>
+
+    <para>
+      Install <application>Qt4</application> by running the following commands:
+    </para>
+
+<screen><userinput>./configure -prefix           $QT4PREFIX \
+            -sysconfdir       /etc/xdg   \
+            -confirm-license             \
+            -opensource                  \
+            -release                     \
+            -dbus-linked                 \
+            -openssl-linked              \
+            -system-sqlite               \
+            -no-phonon                   \
+            -no-phonon-backend           \
+            -no-openvg                   \
+            -nomake demos                \
+            -nomake examples             \
+            -optimized-qmake             &amp;&amp;
 make</userinput></screen>
 
@@ -234,40 +235,43 @@
 
     <para>
-      Remove references to the build directory from the
+      Now as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+rm -rf $QT4PREFIX/tests</userinput></screen>
+
+    <para>
+      Remove references to the build directory from the installed
       <filename class="extension">.pc</filename> files by running
       the following command:
     </para>
 
-<screen><userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
-
-    <para>Now as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-rm -rf /usr/tests</userinput></screen>
-
-    <para>
-      Remove references to the build directory from installed files by
-      running the following command as the
+<screen><userinput>find $QT4PREFIX/lib/pkgconfig -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
+
+    <para>
+      Remove references to the build directory in the installed library dependency
+      (prl) files by running the following command as the
       <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>for file in 3Support CLucene Core DBus Declarative DesignerComponents \
-            Designer Gui Help Multimedia Network OpenGL Script \
-            ScriptTools Sql Svg Test UiTools WebKit XmlPatterns Xml phonon; do
-
-     [ -e /usr/lib/libQt${file}.prl ] &amp;&amp;
-     sed -r '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/\1/' \
-         -i /usr/lib/libQt${file}.prl
-done
-unset file</userinput></screen>
-
-    <para>
-      Install images and create the menu entries 
-      for installed applications.  Be sure that the <envar>QT4PREFIX</envar>
-      variable is defined in root's environment and 
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
+<screen role="root"><userinput>for file in $QT4PREFIX/lib/libQt*.prl; do
+     sed -r -e '/^QMAKE_PRL_BUILD_DIR/d'    \
+            -e 's/(QMAKE_PRL_LIBS =).*/\1/' \
+            -i $file
+done</userinput></screen>
+
+    <para>
+      Install images and create the menu entries for installed applications.
+      The <envar>QT4BINDIR</envar> variable is used here to point to the
+      directory for the executable programs.  If you have changed the bindir
+      above, <envar>QT4BINDIR</envar> will need to be adjusted below.  Be sure
+      that the <envar>QT4BINDIR</envar> variable is defined in root's
+      environment and as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
+
+<screen role="root"><userinput>QT4BINDIR=$QT4PREFIX/bin
+
+install -v -Dm644 src/gui/dialogs/images/qtlogo-64.png \
                   /usr/share/pixmaps/qt4logo.png       &amp;&amp;
 
@@ -290,5 +294,5 @@
 Name=Qt4 Assistant 
 Comment=Shows Qt4 documentation and examples
-Exec=$QT4PREFIX/bin/assistant
+Exec=$QT4BINDIR/assistant
 Icon=assistant-qt4.png
 Terminal=false
@@ -302,5 +306,5 @@
 Name=Qt4 Designer
 Comment=Design GUIs for Qt4 applications
-Exec=$QT4PREFIX/bin/designer
+Exec=$QT4BINDIR/designer
 Icon=designer-qt4.png
 MimeType=application/x-designer;
@@ -315,5 +319,5 @@
 Name=Qt4 Linguist 
 Comment=Add translations to Qt4 applications
-Exec=$QT4PREFIX/bin/linguist
+Exec=$QT4BINDIR/linguist
 Icon=linguist-qt4.png
 MimeType=text/vnd.trolltech.linguist;application/x-linguist;
@@ -329,5 +333,5 @@
 GenericName=D-Bus Debugger
 Comment=Debug D-Bus applications
-Exec=$QT4PREFIX/bin/qdbusviewer
+Exec=$QT4BINDIR/qdbusviewer
 Icon=qdbusviewer-qt4.png
 Terminal=false
@@ -341,5 +345,5 @@
 Name=Qt4 Config 
 Comment=Configure Qt4 behavior, styles, fonts
-Exec=$QT4PREFIX/bin/qtconfig
+Exec=$QT4BINDIR/qtconfig
 Icon=qt4logo.png
 Terminal=false
@@ -349,4 +353,12 @@
 EOF</userinput></screen>
 
+    <para>Some packages such as <xref linkend='vlc'/> look for certain
+    executables with a -qt4 suffix.  Run the following command as the root user
+    to create the necessary symlinks:</para>
+
+<screen role="root"><userinput>for file in moc uic rcc qmake lconvert lrelease lupdate; do
+  ln -sfrvn $QT4BINDIR/$file /usr/bin/$file-qt4
+done</userinput></screen>
+
   </sect2>
 
@@ -436,5 +448,6 @@
 
 QT4DIR=/usr
-export QT4DIR
+QTDIR=$QT4DIR
+export QT4DIR QTDIR
 
 # End /etc/profile.d/qt4.sh</literal>
@@ -442,5 +455,5 @@
 
    <para>
-      If you installed <application>Qt</application> in a location other
+      If you installed <application>Qt4</application> in a location other
       than /usr, you need to update the following configuration files so
       that <application>Qt</application> is correctly found by other packages
@@ -475,9 +488,10 @@
    
 QT4DIR=/opt/qt4
-   
-pathappend /opt/qt4/bin           PATH
-pathappend /opt/qt4/lib/pkgconfig PKG_CONFIG_PATH
-   
-export QT4DIR
+QTDIR=$QT4DIR
+   
+pathappend $QT4DIR/bin           PATH
+pathappend $QT4DIR/lib/pkgconfig PKG_CONFIG_PATH
+   
+export QT4DIR QTDIR
    
 # End /etc/profile.d/qt4.sh</literal>
Index: x/lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision 233a4949984df8eba1128823a84f856fc4778b48)
+++ x/lib/qt5.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
@@ -4,6 +4,4 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
-  <!-- Change for new minor releases !!! -->
 
   <!ENTITY qt5-major "5.4">
@@ -36,10 +34,11 @@
 
     <para>
-      <application>Qt5</application> is a cross-platform application
-      framework that is widely used for developing application software
-      with a graphical user interface (GUI) (in which cases
-      <application>Qt5</application> is classified as a widget toolkit), and
-      also used for developing non-GUI programs such as command-line tools
-      and consoles for servers. 
+      <application>Qt5</application> is a cross-platform application framework
+      that is widely used for developing application software with a graphical
+      user interface (GUI) (in which cases <application>Qt5</application> is
+      classified as a widget toolkit), and also used for developing non-GUI
+      programs such as command-line tools and consoles for servers. One of the
+      major users of <application>Qt</application> is <application>KDE
+      Frameworks 5 (KF5)</application>.
     </para>
 
@@ -139,21 +138,11 @@
     <title>Setting the installation prefix</title>
 
-    <bridgehead renderas="sect3">Installing in /usr</bridgehead>
-
-    <para>
-      If you want to install <application>Qt5</application>
-      in <filename class="directory">/usr</filename>, set the
+    <bridgehead renderas="sect3">Installing in /opt/qt5</bridgehead>
+
+    <para>
+      The BLFS editors recommend installing <application>Qt5</application> in a
+      directory other than <filename class="directory">/usr</filename>, ie
+      <filename class="directory">/opt/qt5</filename>.  To do this,  set the 
       following environment variable:
-    </para>
-
-<screen><userinput>export QT5PREFIX=/usr</userinput></screen>
-
-    <bridgehead renderas="sect3">Installing in /opt/qt5</bridgehead>
-
-    <para>
-      If you want to install <application>Qt5</application> in a directory
-      other than <filename class="directory">/usr</filename>, ie <filename
-      class="directory">/opt/qt4</filename>, set the following environment
-      variable:
     </para>
 
@@ -175,5 +164,5 @@
       <para>
         Later on, you may want to install other versions of
-        <application>Qt4</application>. To do that, just remove the symlink
+        <application>Qt5</application>. To do that, just remove the symlink
         and use <filename class="directory">/opt/qt5</filename> as the
         prefix again. Which version of <application>Qt5</application> you
@@ -186,12 +175,4 @@
   <sect2 role="installation">
     <title>Installation of Qt5</title>
-
-    <caution>
-      <para>
-        If you did not install some of the recommended dependencies, examine
-        <command>./configure --help</command> output to check how to disable
-        them or use internal versions bundled in the source tarball.
-      </para>
-    </caution>
 
     <warning>
@@ -206,29 +187,58 @@
     </warning>
 
-    <para>
-      Install <application>Qt5</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure -prefix         $QT5PREFIX                        \
-            -sysconfdir     /etc/xdg                          \
-            -bindir         $QT5BINDIR                        \
-            -headerdir      $QT5PREFIX/include/qt5            \
-            -archdatadir    $QT5PREFIX/lib/qt5                \
-            -datadir        $QT5PREFIX/share/qt5              \
-            -docdir         $QT5PREFIX/share/doc/qt5          \
-            -translationdir $QT5PREFIX/share/qt5/translations \
-            -examplesdir    $QT5PREFIX/share/doc/qt5/examples \
-            -confirm-license  \
-            -opensource       \
-            -dbus-linked      \
-            -openssl-linked   \
-            -journald         \
-            -system-harfbuzz  \
-            -system-sqlite    \
-            -nomake examples  \
-            -no-rpath         \
-            -optimized-qmake  \
-            -skip qtwebengine &amp;&amp;
+    <caution>
+      <para>
+        If you did not install some of the recommended dependencies, examine
+        <command>./configure --help</command> output to check how to disable
+        them or use internal versions bundled in the source tarball.
+      </para>
+    </caution>
+
+    <note>
+      <para>
+        The build time and space required for the full
+        <application>Qt5</application> is quite long. The instructions below
+        do not build the tutorials and examples. Removing the
+        <parameter>-nomake</parameter> line will create a complete build.
+      </para>
+    </note>
+
+    <note>
+      <para>
+        The BLFS editors do not recommend installing <application>Qt5</application>
+        into the /usr hierarchy because it becomes difficult to find
+        components and to update to a new version.  If you do want to install
+        <application>Qt5</application> in /usr, the directories need to
+        be specified explicitly.  In this case, set QT5PREFIX=/usr and add
+        the following to the configure arguments below:</para>
+
+        <screen><userinput>-bindir         /usr/bin/qt4                \
+-plugindir      /usr/lib/qt5/plugins        \
+-importdir      /usr/lib/qt5/imports        \
+-headerdir      /usr/include/qt5            \
+-datadir        /usr/share/qt5              \
+-docdir         /usr/share/doc/qt5          \
+-translationdir /usr/share/qt5/translations \
+-demosdir       /usr/share/doc/qt5/demos    \
+-examplesdir    /usr/share/doc/qt5/examples </userinput></screen>
+    </note>
+
+    <para>
+      Install <application>Qt5</application> by running the following commands:
+    </para>
+
+<screen><userinput>./configure -prefix         $QT5PREFIX \
+            -sysconfdir     /etc/xdg   \
+            -confirm-license           \
+            -opensource                \
+            -dbus-linked               \
+            -openssl-linked            \
+            -journald                  \
+            -system-harfbuzz           \
+            -system-sqlite             \
+            -nomake examples           \
+            -no-rpath                  \
+            -optimized-qmake           \
+            -skip qtwebengine          &amp;&amp;
 
 make</userinput></screen>
@@ -239,37 +249,42 @@
 
     <para>
-      Remove references to the build directory from the
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      Remove references to the build directory from the installed
       <filename class="extension">.pc</filename> files by running
       the following command:
     </para>
 
-<screen><userinput>find . -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Remove references to the build directory from installed files by
-      running the following commands as the
-      <systemitem class="username">root</systemitem> user:
+<screen><userinput>find $QT5PREFIX/lib/pkgconfig -name "*.pc" -exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
+
+    <para>
+      Remove references to the build directory from installed library dependency
+      (prl) and profile include (pri) files by running the following commands as 
+      the <systemitem class="username">root</systemitem> user:
     </para>
 
 <screen role="root"><userinput>sed -e "s:$PWD/qtbase:/usr/lib/qt5:g" \
-    -i /usr/lib/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri &amp;&amp;
-
-find /usr/lib/lib{qgsttools_p,Qt5*}.prl -exec sed -i -r \
+    -i $QT5PREFIX/lib/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri &amp;&amp;
+
+find $QT5PREFIX/lib/lib{qgsttools_p,Qt5*}.prl -exec sed -i -r \
      '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/\1/' {} \;</userinput></screen>
 
     <para>
-      Install images and create the menu entries
-      for installed applications.  Be sure that the <envar>QT5PREFIX</envar>
-      variable is defined in root's environment and
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755 /usr/share/pixmaps/                  &amp;&amp;
+      Install images and create the menu entries for installed applications.
+      The <envar>QT4BINDIR</envar> variable is used here to point to the
+      directory for the executable programs.  If you have changed the bindir
+      above, <envar>QT4BINDIR</envar> will need to be adjusted below.  Be sure
+      that the <envar>QT5BINDIR</envar> variable is defined in root's
+      environment and as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
+
+<screen role="root"><userinput>QT5BINDIR=$QT5PREFIX/bin
+
+install -v -dm755 /usr/share/pixmaps/                  &amp;&amp;
 
 install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
@@ -291,5 +306,5 @@
 Name=Qt5 Assistant 
 Comment=Shows Qt5 documentation and examples
-Exec=$QT5PREFIX/bin/assistant
+Exec=$QT5BINDIR/assistant
 Icon=assistant-qt5.png
 Terminal=false
@@ -304,5 +319,5 @@
 GenericName=Interface Designer
 Comment=Design GUIs for Qt5 applications
-Exec=$QT5PREFIX/bin/designer
+Exec=$QT5BINDIR/designer
 Icon=designer-qt5.png
 MimeType=application/x-designer;
@@ -317,5 +332,5 @@
 Name=Qt5 Linguist
 Comment=Add translations to Qt5 applications
-Exec=$QT5PREFIX/bin/linguist
+Exec=$QT5BINDOR/linguist
 Icon=linguist-qt5.png
 MimeType=text/vnd.trolltech.linguist;application/x-linguist;
@@ -331,5 +346,5 @@
 GenericName=D-Bus Debugger
 Comment=Debug D-Bus applications
-Exec=$QT5PREFIX/bin/qdbusviewer
+Exec=$QT5BINDIR/qdbusviewer
 Icon=qdbusviewer-qt5.png
 Terminal=false
@@ -339,4 +354,12 @@
 EOF</userinput></screen>
 
+    <para>Some packages such as <xref linkend='vlc'/> look for certain
+    executables with a -qt5 suffix.  Run the following command as the root user
+    to create the necessary symlinks:</para>
+
+<screen role="root"><userinput>for file in moc uic rcc qmake lconvert lrelease lupdate; do
+  ln -sfrvn $QT5BINDIR/$file /usr/bin/$file-qt5
+done</userinput></screen>
+
   </sect2>
 
@@ -362,11 +385,4 @@
       <parameter>-nomake examples</parameter>: This switch
       disables building of the example programs included
-      in the source tarball. Remove it if you want to build
-      them.
-    </para>
-
-    <para>
-      <parameter>-nomake tests</parameter>: This switch
-      disables building of the test programs included
       in the source tarball. Remove it if you want to build
       them.
@@ -474,6 +490,6 @@
 QT5DIR=/opt/qt5
 
-pathappend /opt/qt5/bin           PATH
-pathappend /opt/qt5/lib/pkgconfig PKG_CONFIG_PATH
+pathappend $QT5DIR/bin           PATH
+pathappend $QT5DIR/lib/pkgconfig PKG_CONFIG_PATH
 
 export QT5DIR
