Index: general/genutils/qtchooser-systemd.xml
===================================================================
--- general/genutils/qtchooser-systemd.xml	(revision 8aad3f2d4f682ce6ee795eccbca10a7ecb42abce)
+++ general/genutils/qtchooser-systemd.xml	(revision fad1ab653e5ee7820232c419c98b62c30f606cf3)
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs75_checked;
+    &lfs76_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -165,5 +165,5 @@
       </para>
 
-<screen role="root"><userinput>install -dm755 /etc/xdg/qtchooser &amp;&amp;
+<screen role="root"><userinput>install -v -dm755 /etc/xdg/qtchooser &amp;&amp;
 cat &gt; /etc/xdg/qtchooser/qt4.conf &lt;&lt; "EOF"
 <literal>/usr/lib/qt4/bin
@@ -183,5 +183,5 @@
       </para>
 
-<screen role="root"><userinput>install -dm755 /etc/xdg/qtchooser &amp;&amp;
+<screen role="root"><userinput>install -v -dm755 /etc/xdg/qtchooser &amp;&amp;
 cat &gt; /etc/xdg/qtchooser/qt4.conf &lt;&lt; "EOF"
 <literal>/opt/qt4/lib/qt4/bin
Index: general/graphlib/openjpeg.xml
===================================================================
--- general/graphlib/openjpeg.xml	(revision 8aad3f2d4f682ce6ee795eccbca10a7ecb42abce)
+++ general/graphlib/openjpeg.xml	(revision fad1ab653e5ee7820232c419c98b62c30f606cf3)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY openjpeg-download-http "http://downloads.sourceforge.net/project/openjpeg.mirror/&openjpeg-version;/openjpeg-&openjpeg-version;.tar.gz">
-<!--  <!ENTITY openjpeg-download-http "http://openjpeg.googlecode.com/files/openjpeg-&openjpeg-version;.tar.gz">-->
+  <!ENTITY openjpeg-download-http "&sourceforge-repo;/openjpeg.mirror/openjpeg-&openjpeg-version;.tar.gz">
   <!ENTITY openjpeg-download-ftp  " ">
   <!ENTITY openjpeg-md5sum        "c41772c30fb1c272358b3707233134a1">
@@ -35,5 +34,5 @@
     and can compress/decompress lossless 16-bit images.</para>
 
-    &lfs75_checked;
+    &lfs76_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -58,13 +57,5 @@
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/openjpeg-&openjpeg-version;-security_fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
+
     <bridgehead renderas="sect3">OpenJPEG Dependencies</bridgehead>
 
@@ -100,20 +91,8 @@
     <title>Command Explanations</title>
 
-    <para><option>--disable-static</option>: This prevents the
-    static library from being built.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
-
-  <!--
-  <sect2 role="configuration">
-    <title>Configuring OpenJPEG</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-    </sect3>
-
-  </sect2>
-  -->
 
   <sect2 role="content">
Index: general/graphlib/poppler-systemd.xml
===================================================================
--- general/graphlib/poppler-systemd.xml	(revision 8aad3f2d4f682ce6ee795eccbca10a7ecb42abce)
+++ general/graphlib/poppler-systemd.xml	(revision fad1ab653e5ee7820232c419c98b62c30f606cf3)
@@ -44,5 +44,5 @@
     </para>
 
-    &lfs75_checked;
+    &lfs76_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/lib/libdrm.xml
===================================================================
--- x/lib/libdrm.xml	(revision 8aad3f2d4f682ce6ee795eccbca10a7ecb42abce)
+++ x/lib/libdrm.xml	(revision fad1ab653e5ee7820232c419c98b62c30f606cf3)
@@ -76,6 +76,6 @@
     <bridgehead renderas="sect3">libdrm Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
       <xref linkend="xorg7-lib"/> (for Intel KMS API support required by Mesa) <!-- libpciaccess -->
     </para>
Index: x/lib/qt4-systemd.xml
===================================================================
--- x/lib/qt4-systemd.xml	(revision 8aad3f2d4f682ce6ee795eccbca10a7ecb42abce)
+++ x/lib/qt4-systemd.xml	(revision fad1ab653e5ee7820232c419c98b62c30f606cf3)
@@ -41,5 +41,5 @@
     </para>
 
-    &lfs75_checked;
+    &lfs76_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -450,5 +450,6 @@
 do
   ln -sfrv $QT4BINDIR/$file /usr/bin/$file-qt4
-done</userinput></screen>
+done
+unset file</userinput></screen>
 
   </sect2>
Index: x/lib/qt5-systemd.xml
===================================================================
--- x/lib/qt5-systemd.xml	(revision 8aad3f2d4f682ce6ee795eccbca10a7ecb42abce)
+++ x/lib/qt5-systemd.xml	(revision fad1ab653e5ee7820232c419c98b62c30f606cf3)
@@ -42,5 +42,5 @@
     </para>
 
-    &lfs75_checked;
+    &lfs76_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -323,5 +323,5 @@
     -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 \
+find $QT5PREFIX/lib/lib{Enginio,qgsttools_p,Qt5*}.prl -exec sed -i -r \
      '/^QMAKE_PRL_BUILD_DIR/d;s/(QMAKE_PRL_LIBS =).*/\1/' {} \;</userinput></screen>
 
@@ -414,5 +414,6 @@
 do
   ln -sfrv $QT5BINDIR/$file /usr/bin/$file-qt5
-done</userinput></screen>
+done
+unset file</userinput></screen>
 
   </sect2>
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 8aad3f2d4f682ce6ee795eccbca10a7ecb42abce)
+++ xsoft/graphweb/firefox.xml	(revision fad1ab653e5ee7820232c419c98b62c30f606cf3)
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs75_checked;
+    &lfs76_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -260,9 +260,4 @@
       commands:
     </para>
-
-    <note><para>
-      If you are compiling <application>Firefox</application> in chroot, prepend
-      <envar>SHELL=/bin/sh</envar> to the first make command below.
-    </para></note>
       
 <screen><userinput>make -f client.mk</userinput></screen>
@@ -272,12 +267,4 @@
     </para>
 
-<!--    <para>
-      If you have <emphasis>not</emphasis> linked
-      <application>Firefox</application> against an installed
-      <application>Xulrunner</application>:
-    </para>
-
-<screen><userinput>make -C firefox-build-dir/browser/installer</userinput></screen>
--->
     <para>
       Now, as the <systemitem class="username">root</systemitem> user, if you
@@ -287,12 +274,4 @@
     </para>
 
-<!--<screen role="root"><userinput>rm -rf /usr/lib/firefox-&firefox-version; &amp;&amp;
-mkdir  /usr/lib/firefox-&firefox-version; &amp;&amp;
-
-tar -xvf firefox-build-dir/dist/firefox-&firefox-version;.en-US.linux-$(uname -m).tar.bz2 \
-    -C /usr/lib/firefox-&firefox-version; -\-strip-components=1 &amp;&amp;
-chown -R -v root:root /usr/lib/firefox-&firefox-version; &amp;&amp;
-
-ln -sfv ../lib/firefox-&firefox-version;/firefox /usr/bin &amp;&amp;-->
 <screen role="root"><userinput>make -f client.mk install INSTALL_SDK= &amp;&amp;
 
@@ -383,5 +362,4 @@
 
 <screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
-mkdir -pv /usr/share/pixmaps &amp;&amp;
 
 cat &gt; /usr/share/applications/firefox.desktop &lt;&lt; "EOF" &amp;&amp;
@@ -400,6 +378,13 @@
 EOF
 
-ln -sfv /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png \
-        /usr/share/pixmaps/firefox.png</userinput></screen>
+for s in 16 32 48
+do
+install -v -Dm644 /usr/lib/firefox-&firefox-version;/browser/chrome/icons/default/default${s}.png \
+                  /usr/share/icons/hicolor/${s}x${s}/apps/firefox.png
+done &amp;&amp;
+install -v -Dm644 /usr/lib/firefox-&firefox-version;/browser/icons/mozicon128.png \
+                  /usr/share/icons/hicolor/128x128/apps/firefox.png &amp;&amp;
+gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
+unset s</userinput></screen>
 
   </sect2>
@@ -411,5 +396,5 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -418,10 +403,9 @@
         </seg>
         <seg>
-          Numerous libraries, browser components, plugins, extensions, and
-          helper modules installed in
-          <filename class="directory">/usr/lib/firefox-&firefox-version;</filename>
+          None
         </seg>
         <seg>
-          /usr/lib/firefox-&firefox-version;
+          /usr/lib/firefox-&firefox-version; and
+          /usr/lib/mozilla/plugins
         </seg>
       </seglistitem>
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 8aad3f2d4f682ce6ee795eccbca10a7ecb42abce)
+++ xsoft/other/thunderbird.xml	(revision fad1ab653e5ee7820232c419c98b62c30f606cf3)
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs75_checked;
+    &lfs76_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -157,8 +157,8 @@
 
 <screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
-# If you have a multicore machine you can speed up the build by running
-# several jobs at once by uncommenting the following line and setting the
-# value to number of CPU cores:
-#mk_add_options MOZ_MAKE_FLAGS="-j4"
+# If you have a multicore machine, firefox will now use all the cores by
+# default. Exceptionally, you can reduce the number of cores, e.g. to 1,
+# by uncommenting the next line and setting a valid number of CPU cores.
+#mk_add_options MOZ_MAKE_FLAGS="-j1"
 
 # If you have installed DBus-Glib comment out this line:
@@ -231,6 +231,7 @@
 
     <para>
-      First, a bug needs to be fixed. Notice that thunderbuild needs to match
-      the value used in mozconfig (above) for the object directory (MOZ_OBJDIR):
+      First, a bug needs to be fixed. Notice that thunderbuild matches
+      the value used in mozconfig (above) for the object directory
+      (MOZ_OBJDIR):
     </para>
 
@@ -242,11 +243,5 @@
     </para>
 
-    <note><para>
-      If you are compiling <application>Thunderbird</application> in chroot,
-      prepend <envar>SHELL=/bin/sh</envar> to the <!--first -->make command below.
-    </para></note>
-
-<screen><userinput>make -f client.mk<!--
-make -C thunderbuild/mail/installer--></userinput></screen>
+<screen><userinput>make -f client.mk</userinput></screen>
 
     <para>
@@ -258,9 +253,4 @@
       commands as the <systemitem class="username">root</systemitem> user:
     </para>
-
-<!--<screen role="root"><userinput>mkdir -pv /usr/lib/thunderbird-&thunderbird-version; &amp;&amp;
-tar -xvf thunderbuild/mozilla/dist/thunderbird-&thunderbird-version;.en-US.linux-$(uname -m).tar.bz2 \
-    -C /usr/lib/thunderbird-&thunderbird-version; -\-strip-components=1 &amp;&amp;
-ln -sfv ../lib/thunderbird-&thunderbird-version;/thunderbird /usr/bin</userinput></screen>-->
 
 <screen role="root"><userinput>make -f client.mk install INSTALL_SDK=</userinput></screen>
@@ -275,13 +265,9 @@
 
 <screen role="root"><userinput>make -C thunderbuild install</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>mkdir -vp mozilla/thunderbuild</command>: fixes a build failure
-      of Makefile at the beginning of build, where a file cannot be found.
-    </para>
 
     <para>
@@ -354,5 +340,4 @@
 
 <screen role="root"><userinput>mkdir -pv /usr/share/applications &amp;&amp;
-mkdir -pv /usr/share/pixmaps &amp;&amp;
 
 cat &gt; /usr/share/applications/thunderbird.desktop &lt;&lt; "EOF" &amp;&amp;
@@ -371,7 +356,14 @@
 EOF
 
-ln -sfv /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default256.png \
-        /usr/share/pixmaps/thunderbird.png</userinput></screen>
+for s in 16 22 24 32 48 256
+do
+install -v -Dm644 /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default${s}.png \
+                  /usr/share/icons/hicolor/${s}x${s}/apps/thunderbird.png
+done &amp;&amp;
+gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
+unset s</userinput></screen>
+
     </sect3>
+
   </sect2>
 
