Index: general/genlib/enchant.xml
===================================================================
--- general/genlib/enchant.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/genlib/enchant.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -33,5 +33,5 @@
     interface into various existing spell checking libraries.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/genlib/grantlee.xml
===================================================================
--- general/genlib/grantlee.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/genlib/grantlee.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/genlib/js.xml
===================================================================
--- general/genlib/js.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/genlib/js.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -16,5 +16,5 @@
 
 <sect1 id="JS" xreflabel="JS-&JS-version;">
-  <?dbhtml filename="JS.html"?>
+  <?dbhtml filename="js.html"?>
 
   <sect1info>
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -119,4 +119,5 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
+
 find /usr/include/js-17.0/            \
      /usr/lib/libmozjs-17.0.a         \
Index: general/genlib/libdbusmenuqt.xml
===================================================================
--- general/genlib/libdbusmenuqt.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/genlib/libdbusmenuqt.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -33,5 +33,5 @@
     of the DBusMenu specs, which goal is to expose menus on DBus.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/genlib/libical.xml
===================================================================
--- general/genlib/libical.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/genlib/libical.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/genlib/qca.xml
===================================================================
--- general/genlib/qca.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/genlib/qca.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -35,5 +35,5 @@
     the implementation, using plugins known as Providers.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/genlib/qjson.xml
===================================================================
--- general/genlib/qjson.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/genlib/qjson.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -93,5 +93,6 @@
 
 <screen><userinput>mkdir build &amp;&amp;
-cd build &amp;&amp;
+cd    build &amp;&amp;
+
 cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_BUILD_TYPE=Release  \
Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/genutils/graphviz.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/genutils/pinentry.xml
===================================================================
--- general/genutils/pinentry.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/genutils/pinentry.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -42,5 +42,5 @@
     <application>Qt3</application>, and <application>Qt4</application>.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/graphlib/jasper.xml
===================================================================
--- general/graphlib/jasper.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/graphlib/jasper.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -34,5 +34,5 @@
     JPEG-2000 codec.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/prog/cvs.xml
===================================================================
--- general/prog/cvs.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/prog/cvs.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -36,5 +36,5 @@
     creation of a repository is covered at <xref linkend="cvsserver"/>.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/prog/gdb.xml
===================================================================
--- general/prog/gdb.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/prog/gdb.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/prog/librep.xml
===================================================================
--- general/prog/librep.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/prog/librep.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -34,5 +34,5 @@
     interpreter as an extension language.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/prog/npapi-sdk.xml
===================================================================
--- general/prog/npapi-sdk.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/prog/npapi-sdk.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -11,5 +11,5 @@
   <!ENTITY npapi-sdk-size          "65 KB">
   <!ENTITY npapi-sdk-buildsize     "520 KB">
-  <!ENTITY npapi-sdk-time          "0.1 SBU">
+  <!ENTITY npapi-sdk-time          "less than 0.1 SBU">
 ]>
 
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/prog/perl-modules.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -242,5 +242,5 @@
     the standard <xref linkend="perl-standard-install"/>.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <itemizedlist>
Index: general/prog/swig.xml
===================================================================
--- general/prog/swig.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/prog/swig.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -58,5 +58,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/prog/tk.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/prog/valgrind.xml
===================================================================
--- general/prog/valgrind.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/prog/valgrind.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/sysutils/pm-utils.xml
===================================================================
--- general/sysutils/pm-utils.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/sysutils/pm-utils.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/sysutils/strigi.xml
===================================================================
--- general/sysutils/strigi.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/sysutils/strigi.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -35,5 +35,5 @@
     archives.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/sysutils/udisks2.xml
===================================================================
--- general/sysutils/udisks2.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/sysutils/udisks2.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: general/sysutils/upower.xml
===================================================================
--- general/sysutils/upower.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ general/sysutils/upower.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/add/konsole.xml
===================================================================
--- kde/add/konsole.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/add/konsole.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY konsole-download-http "&kde-download-http;&kde-version;/src/konsole-&kde-version;.tar.xz">
+  <!ENTITY konsole-download-http "&kde-download-http;applications/&kde-apps-version;/src/konsole-&kde-apps-version;.tar.xz">
   <!ENTITY konsole-download-ftp  " ">
-  <!ENTITY konsole-md5sum        "1c81a9a2c073f7992671e168b7285a2a">
-  <!ENTITY konsole-size          "448 KB">
-  <!ENTITY konsole-buildsize     "18 MB">
-  <!ENTITY konsole-time          "0.6 SBU">
+  <!ENTITY konsole-md5sum        "a01d5bb7afb71b47ed3329744addc08f">
+  <!ENTITY konsole-size          "444 KB">
+  <!ENTITY konsole-buildsize     "15 MB">
+  <!ENTITY konsole-time          "0.1 SBU (using parallelism=10)">
 ]>
 
-<sect1 id="konsole" xreflabel="konsole-&kde-version;">
+<sect1 id="konsole" xreflabel="konsole-&kde-apps-version;">
   <?dbhtml filename="konsole.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Konsole-&kde-version;</title>
+  <title>Konsole-&kde-apps-version;</title>
 
   <indexterm zone="konsole">
@@ -56,13 +56,4 @@
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/konsole-&kde-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
     <bridgehead renderas="sect3">Konsole Dependencies</bridgehead>
 
Index: kde/core/akonadi.xml
===================================================================
--- kde/core/akonadi.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/core/akonadi.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -35,5 +35,5 @@
     retrieval.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/attica.xml
===================================================================
--- kde/core/attica.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/core/attica.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -33,5 +33,5 @@
     "Open Collaboration Service" providers.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/baloo-widgets.xml
===================================================================
--- kde/core/baloo-widgets.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/core/baloo-widgets.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -32,5 +32,5 @@
     <para>Baloo-widgets contains widgets for the baloo search framework.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/baloo.xml
===================================================================
--- kde/core/baloo.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/core/baloo.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -32,5 +32,5 @@
     <para>Baloo is a framework for searching and managing metadata.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/kde-base-artwork.xml
===================================================================
--- kde/core/kde-base-artwork.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/core/kde-base-artwork.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -5,7 +5,7 @@
   %general-entities;
 
-  <!ENTITY kde-base-artwork-download-http "&kde-download-http;&kde-version;/src/kde-base-artwork-&kde-version;.tar.xz">
+  <!ENTITY kde-base-artwork-download-http "&kde-download-http;applications/&kde-apps-version;/src/kde-base-artwork-&kde-apps-version;.tar.xz">
   <!ENTITY kde-base-artwork-download-ftp  " ">
-  <!ENTITY kde-base-artwork-md5sum        "7c3e22de2cd389f9c40fe2b6694489ac">
+  <!ENTITY kde-base-artwork-md5sum        "4fa7e833854aa28afd9392e415300cf5">
   <!ENTITY kde-base-artwork-size          "7.1 MB">
   <!ENTITY kde-base-artwork-buildsize     "15 MB">
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="kde-base-artwork" xreflabel="kde-base-artwork-&kde-version;">
+<sect1 id="kde-base-artwork" xreflabel="kde-base-artwork-&kde-apps-version;">
   <?dbhtml filename="kde-base-artwork.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Kde-base-artwork-&kde-version;</title>
+  <title>Kde-base-artwork-&kde-apps-version;</title>
 
   <indexterm zone="kde-base-artwork">
@@ -32,5 +32,5 @@
     <para>This package provides the default splash screen for KDE.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/kde-baseapps.xml
===================================================================
--- kde/core/kde-baseapps.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/core/kde-baseapps.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY kde-baseapps-download-http "&kde-download-http;&kde-version;/src/kde-baseapps-&kde-version;.tar.xz">
+  <!ENTITY kde-baseapps-download-http "&kde-download-http;applications/&kde-apps-version;/src/kde-baseapps-&kde-apps-version;.tar.xz">
   <!ENTITY kde-baseapps-download-ftp  " ">
-  <!ENTITY kde-baseapps-md5sum        "20ffb374b03bdab5ee761b272f839fea">
-  <!ENTITY kde-baseapps-size          "2.4 MB">
-  <!ENTITY kde-baseapps-buildsize     "105 MB">
-  <!ENTITY kde-baseapps-time          "4.1 SBU">
+  <!ENTITY kde-baseapps-md5sum        "28c204e6d3ae7d670e75504ee80a9b0a">
+  <!ENTITY kde-baseapps-size          "2.5 MB">
+  <!ENTITY kde-baseapps-buildsize     "102 MB">
+  <!ENTITY kde-baseapps-time          "0.6 SBU (using parallelism=10)">
 ]>
 
-<sect1 id="kde-baseapps" xreflabel="kde-baseapps-&kde-version;">
+<sect1 id="kde-baseapps" xreflabel="kde-baseapps-&kde-apps-version;">
   <?dbhtml filename="kde-baseapps.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Kde-baseapps-&kde-version;</title>
+  <title>Kde-baseapps-&kde-apps-version;</title>
 
   <indexterm zone="kde-baseapps">
@@ -34,5 +34,5 @@
     libraries are also provided.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/kde-runtime.xml
===================================================================
--- kde/core/kde-runtime.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/core/kde-runtime.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY kde-runtime-download-http "&kde-download-http;&kde-version;/src/kde-runtime-&kde-version;.tar.xz">
+  <!ENTITY kde-runtime-download-http "&kde-download-http;applications/&kde-apps-version;/src/kde-runtime-&kde-apps-version;.tar.xz">
   <!ENTITY kde-runtime-download-ftp  " ">
-  <!ENTITY kde-runtime-md5sum        "fbba547e4446b51702e5de8bcae078d5">
+  <!ENTITY kde-runtime-md5sum        "6c9eaba92b0bc92892f119e9ed657536">
   <!ENTITY kde-runtime-size          "7.5 MB">
-  <!ENTITY kde-runtime-buildsize     "146 MB">
-  <!ENTITY kde-runtime-time          "4.3 SBU">
+  <!ENTITY kde-runtime-buildsize     "138 MB">
+  <!ENTITY kde-runtime-time          "0.8 SBU (using parallelism=10)">
 ]>
 
-<sect1 id="kde-runtime" xreflabel="kde-runtime-&kde-version;">
+<sect1 id="kde-runtime" xreflabel="kde-runtime-&kde-apps-version;">
   <?dbhtml filename="kde-runtime.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Kde-runtime-&kde-version;</title>
+  <title>Kde-runtime-&kde-apps-version;</title>
 
   <indexterm zone="kde-runtime">
@@ -33,5 +33,5 @@
     for <application>KDE</application>.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/kde-workspace.xml
===================================================================
--- kde/core/kde-workspace.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/core/kde-workspace.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -5,11 +5,10 @@
   %general-entities;
 
-  <!ENTITY ws-dir "4.14.3">
-  <!ENTITY kde-workspace-download-http "&kde-download-http;&ws-dir;/src/kde-workspace-&kde-workspace-version;.tar.xz">
-  <!ENTITY kde-workspace-download-ftp  "&kde-download-ftp;&ws-dir;/src/kde-workspace-&kde-workspace-version;.tar.xz">
-  <!ENTITY kde-workspace-md5sum        "65fd29346b8ec2afb2af78fe9b6225db">
+  <!ENTITY kde-workspace-download-http "&kde-download-http;applications/&kde-apps-version;/src/kde-workspace-&kde-workspace-version;.tar.xz">
+  <!ENTITY kde-workspace-download-ftp  "&kde-download-ftp;applications/&kde-apps-version;/src/kde-workspace-&kde-workspace-version;.tar.xz">
+  <!ENTITY kde-workspace-md5sum        "d580a4d6339930d4c12a498ab46f27af">
   <!ENTITY kde-workspace-size          "12.9 MB">
-  <!ENTITY kde-workspace-buildsize     "301 MB">
-  <!ENTITY kde-workspace-time          "12.9 SBU">
+  <!ENTITY kde-workspace-buildsize     "384 MB">
+  <!ENTITY kde-workspace-time          "2.2 SBU (using parallelism=10)">
 ]>
 
@@ -38,5 +37,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/core/kdelibs.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY kdelibs-download-http "&kde-download-http;&kde-version;/src/kdelibs-&kde-version;.tar.xz">
+  <!ENTITY kdelibs-download-http "&kde-download-http;applications/&kde-apps-version;/src/kdelibs-&kde-libs-version;.tar.xz">
   <!ENTITY kdelibs-download-ftp  " ">
-  <!ENTITY kdelibs-md5sum        "ac0e44b2a6a138df56a501581e537615">
+  <!ENTITY kdelibs-md5sum        "6587cca14d92eb2ced735c12361d86d3">
   <!ENTITY kdelibs-size          "11.1 MB">
-  <!ENTITY kdelibs-buildsize     "463 MB">
-  <!ENTITY kdelibs-time          "17 SBU">
+  <!ENTITY kdelibs-buildsize     "450 MB">
+  <!ENTITY kdelibs-time          "3.4 SBU (using parallelism=10)">
 ]>
 
-<sect1 id="kdelibs" xreflabel="kdelibs-&kde-version;">
+<sect1 id="kdelibs" xreflabel="kdelibs-&kde-libs-version;">
   <?dbhtml filename="kdelibs.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Kdelibs-&kde-version;</title>
+  <title>Kdelibs-&kde-libs-version;</title>
 
   <indexterm zone="kdelibs">
@@ -33,5 +33,5 @@
     are central to development and execution of KDE programs.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -57,13 +57,4 @@
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kde4libs-&kde-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
     <bridgehead renderas="sect3">Kdelibs Dependencies</bridgehead>
 
Index: kde/core/kdepimlibs.xml
===================================================================
--- kde/core/kdepimlibs.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/core/kdepimlibs.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY kdepimlibs-download-http "&kde-download-http;&kde-version;/src/kdepimlibs-&kde-version;.tar.xz">
+  <!ENTITY kdepimlibs-download-http "&kde-download-http;applications/&kde-apps-version;/src/kdepimlibs-&kde-libs-version;.tar.xz">
   <!ENTITY kdepimlibs-download-ftp  " ">
-  <!ENTITY kdepimlibs-md5sum        "5ed5d667bc60649a72149bdf44f05fef">
+  <!ENTITY kdepimlibs-md5sum        "0c027a427a15487d594aa1d6d20b339c">
   <!ENTITY kdepimlibs-size          "2.7 MB">
-  <!ENTITY kdepimlibs-buildsize     "216 MB">
-  <!ENTITY kdepimlibs-time          "8.1 SBU">
+  <!ENTITY kdepimlibs-buildsize     "212 MB">
+  <!ENTITY kdepimlibs-time          "1.4 (using parallelism=10) SBU">
 ]>
 
-<sect1 id="kdepimlibs" xreflabel="kdepimlibs-&kde-version;">
+<sect1 id="kdepimlibs" xreflabel="kdepimlibs-&kde-libs-version;">
   <?dbhtml filename="kdepimlibs.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Kdepimlibs-&kde-version;</title>
+  <title>Kdepimlibs-&kde-libs-version;</title>
 
   <indexterm zone="kdepimlibs">
@@ -34,5 +34,5 @@
     <command>kmail</command>, <command>kalarm</command>, etc.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -58,13 +58,4 @@
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kdepimlibs-&kde-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
     <bridgehead renderas="sect3">Kdepimlibs Dependencies</bridgehead>
 
Index: kde/core/kfilemetadata.xml
===================================================================
--- kde/core/kfilemetadata.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/core/kfilemetadata.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -32,5 +32,5 @@
     <para>Kfilemetadata is a framework for searching and managing metadata.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/oxygen-icons.xml
===================================================================
--- kde/core/oxygen-icons.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/core/oxygen-icons.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY oxygen-icons-download-http "&kde-download-http;&kde-version;/src/oxygen-icons-&kde-version;.tar.xz">
+  <!ENTITY oxygen-icons-download-http "&kde-download-http;applications/&kde-apps-version;/src/oxygen-icons-&kde-apps-version;.tar.xz">
   <!ENTITY oxygen-icons-download-ftp  " ">
-  <!ENTITY oxygen-icons-md5sum        "9eff228b329830b06a5a20fc8e6804a8">
+  <!ENTITY oxygen-icons-md5sum        "f817409a1bcc458ee82d123576e4c85b">
   <!ENTITY oxygen-icons-size          "219 MB">
-  <!ENTITY oxygen-icons-buildsize     "509 MB">
+  <!ENTITY oxygen-icons-buildsize     "473 MB">
   <!ENTITY oxygen-icons-time          "less than 0.1 SBU">
 ]>
 
-<sect1 id="oxygen-icons" xreflabel="oxygen-icons-&kde-version;">
+<sect1 id="oxygen-icons" xreflabel="oxygen-icons-&kde-apps-version;">
   <?dbhtml filename="oxygen-icons.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Oxygen-icons-&kde-version;</title>
+  <title>Oxygen-icons-&kde-apps-version;</title>
 
   <indexterm zone="oxygen-icons">
@@ -33,5 +33,5 @@
     high standard of graphics quality.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/polkit-kde-agent.xml
===================================================================
--- kde/core/polkit-kde-agent.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/core/polkit-kde-agent.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -34,5 +34,5 @@
     for performing administrative tasks in KDE.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/polkit-qt.xml
===================================================================
--- kde/core/polkit-qt.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/core/polkit-qt.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -33,5 +33,5 @@
     <application>polkit</application> in the Qt environment.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/core/qimageblitz.xml
===================================================================
--- kde/core/qimageblitz.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ kde/core/qimageblitz.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -33,5 +33,5 @@
     filter library for <application>KDE</application>.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/libdriv/faad2.xml
===================================================================
--- multimedia/libdriv/faad2.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ multimedia/libdriv/faad2.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -34,5 +34,5 @@
     and known as Advanced Audio Coding (AAC).</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/libdriv/libcanberra.xml
===================================================================
--- multimedia/libdriv/libcanberra.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ multimedia/libdriv/libcanberra.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ multimedia/libdriv/xine-lib.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: packages.ent
===================================================================
--- packages.ent	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ packages.ent	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -493,5 +493,7 @@
 <!-- Part VII -->
 <!-- Chapters 27-29 -->                           <!-- stable lt .90 micro version -->
-<!ENTITY kde-version                  "4.14.3">    <!-- applies to all kde packages -->
+<!ENTITY kde-version                  "4.14.3">   <!-- applies to older kde4 packages -->
+<!ENTITY kde-apps-version             "14.12.2">  <!-- applies to most other kde packages -->
+<!ENTITY kde-libs-version             "4.14.5"> 
 <!ENTITY kde-dldir                    "&kde-version;">
 <!ENTITY kde-download-http            "http://download.kde.org/stable/">
@@ -500,5 +502,5 @@
 <!ENTITY kde-dir                      "$&kde-dir-var;">
 <!ENTITY kactivities-version          "4.13.3">
-<!ENTITY kde-workspace-version        "4.11.14">
+<!ENTITY kde-workspace-version        "4.11.16">
 <!ENTITY automoc4-version             "0.9.88">
 <!ENTITY phonon-version               "4.8.3">
Index: postlfs/filesystems/parted.xml
===================================================================
--- postlfs/filesystems/parted.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ postlfs/filesystems/parted.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: postlfs/security/consolekit.xml
===================================================================
--- postlfs/security/consolekit.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ postlfs/security/consolekit.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ postlfs/security/cyrus-sasl.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -126,4 +126,5 @@
 <screen><userinput>patch -Np1 -i ../cyrus-sasl-&cyrus-sasl-version;-fixes-3.patch &amp;&amp;
 autoreconf -fi &amp;&amp;
+
 ./configure --prefix=/usr        \
             --sysconfdir=/etc    \
@@ -131,5 +132,5 @@
             --with-dbpath=/var/lib/sasl/sasldb2 \
             --with-saslauthd=/var/run/saslauthd &amp;&amp;
-make</userinput></screen>
+make -j1</userinput></screen>
 
     <para>
Index: postlfs/security/gnupg2.xml
===================================================================
--- postlfs/security/gnupg2.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ postlfs/security/gnupg2.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -38,5 +38,5 @@
     S/MIME.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -117,7 +117,7 @@
 <screen role="root"><userinput>make install &amp;&amp;
 
-install -v -m755 -d /usr/share/doc/gnupg-&gnupg2-version;/html       &amp;&amp;
+install -v -m755 -d /usr/share/doc/gnupg-&gnupg2-version;/html            &amp;&amp;
 install -v -m644    doc/gnupg_nochunks.html \
-                    /usr/share/doc/gnupg-&gnupg2-version;/gnupg.html &amp;&amp;
+                    /usr/share/doc/gnupg-&gnupg2-version;/html/gnupg.html &amp;&amp;
 install -v -m644    doc/*.texi doc/gnupg.txt \
                     /usr/share/doc/gnupg-&gnupg2-version;</userinput></screen>
Index: postlfs/security/gpgme.xml
===================================================================
--- postlfs/security/gpgme.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ postlfs/security/gpgme.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: postlfs/security/polkit.xml
===================================================================
--- postlfs/security/polkit.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ postlfs/security/polkit.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: pst/printing/gs.xml
===================================================================
--- pst/printing/gs.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ pst/printing/gs.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -48,5 +48,5 @@
     used for that.</para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ server/databases/db.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -189,4 +189,5 @@
 
 <screen role="root"><userinput>make docdir=/usr/share/doc/db-&db-version; install &amp;&amp;
+
 chown -v -R root:root                        \
       /usr/bin/db_*                          \
Index: server/databases/mariadb.xml
===================================================================
--- server/databases/mariadb.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ server/databases/mariadb.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: server/other/openldap.xml
===================================================================
--- server/other/openldap.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ server/other/openldap.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision 718593a75427a1f7379eec1062784f668aa38b3f)
+++ x/installing/xorg7.xml	(revision aed3e6ec9cb7f48735c7a907a479ff3c024da9e3)
@@ -183,5 +183,10 @@
     user:</para>
 
-<screen><userinput role="root">ln -s $XORG_PREFIX/share/X11 /usr/share/X11</userinput></screen>
+<screen><userinput role="root">ln -sf $XORG_PREFIX/share/X11 /usr/share/X11</userinput></screen>
+
+    <para>If building KDE, some cmake files look for Xorg in places other than
+    $XORG_PREFIX.  Allow cmake to find Xorg with:</para>
+
+<screen><userinput role="root">ln -sf $XORG_PREFIX /usr/X11R6</userinput></screen>
 
     <para>Finally, if building on x86_64, you will need to create the
@@ -193,5 +198,5 @@
 <screen><userinput role="root">install -v -m755 -d $XORG_PREFIX &amp;&amp;
 install -v -m755 -d $XORG_PREFIX/lib &amp;&amp;
-ln -s lib $XORG_PREFIX/lib64</userinput></screen>
+ln -sf lib $XORG_PREFIX/lib64</userinput></screen>
 
   </sect2>
