Index: general.ent
===================================================================
--- general.ent	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ general.ent	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY day          "05">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2013">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 2nd, &year;">
+<!ENTITY releasedate  "January 5th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -609,7 +609,7 @@
 <!-- Part VII -->
 <!-- Chapters 27-29 -->
-<!ENTITY kde-version                 "4.9.3">
+<!ENTITY kde-version                 "4.9.5">
 <!ENTITY kde-dldir                   "&kde-version;">
-<!ENTITY kde-download-http           "http://mirrors.isc.org/pub/kde/stable/">
+<!ENTITY kde-download-http           "http://download.kde.org/stable/">
 <!ENTITY kde-download-ftp            "ftp://ftp.kde.org/pub/kde/stable/">
 <!ENTITY kde-dir-var                 "KDE_PREFIX">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ introduction/welcome/changelog.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -46,4 +46,13 @@
 
     <listitem>
+      <para>January 5th, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - KDE 4.9.5..</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 2nd, 2013</para>
       <itemizedlist>
Index: kde/add/add.xml
===================================================================
--- kde/add/add.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/add/add.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -19,10 +19,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ark.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeadmin.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdenetwork.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmix.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libkcddb.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdepim-runtime.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdepim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdepim-runtime.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-base-artwork.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libkexiv2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeplasma-addons.xml"/>
Index: kde/add/ark.xml
===================================================================
--- kde/add/ark.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/add/ark.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY ark-download-http "&kde-download-http;&kde-version;/src/ark-&kde-version;.tar.xz">
   <!ENTITY ark-download-ftp  "&kde-download-ftp;&kde-version;/src/ark-&kde-version;.tar.xz">
-  <!ENTITY ark-md5sum        "5082c4154fc7e3afb10cd4b7264d0f1f">
-  <!ENTITY ark-size          "234 KB">
-  <!ENTITY ark-buildsize     "34 MB">
+  <!ENTITY ark-md5sum        "17d1c8efe0095ce57310f4873cd9a730">
+  <!ENTITY ark-size          "236 KB">
+  <!ENTITY ark-buildsize     "9.5 MB">
   <!ENTITY ark-time          "0.8 SBU">
 ]>
@@ -72,9 +72,5 @@
     <xref linkend="libarchive"/>
     </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    </para>
--->
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -97,5 +93,5 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -106,17 +102,10 @@
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Program</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
@@ -128,5 +117,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -134,9 +123,9 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-ark">
+      <varlistentry id="ark-prog">
         <term><command>ark</command></term>
         <listitem>
-          <para>is a testing utility for ark-generated build trees.</para>
-          <indexterm zone="a-ark ark">
+          <para>is the KDE archiving utility.</para>
+          <indexterm zone="ark ark-prog">
             <primary sortas="b-ark">ark</primary>
           </indexterm>
@@ -145,5 +134,5 @@
 
     </variablelist>
--->
+
   </sect2>
 
Index: kde/add/gwenview.xml
===================================================================
--- kde/add/gwenview.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/add/gwenview.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -5,9 +5,9 @@
   %general-entities;
 
-  <!ENTITY gwenview-download-http "http://mirrors.isc.org/pub/kde/stable/&kde-version;/src/gwenview-&kde-version;.tar.xz">
-  <!ENTITY gwenview-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/&kde-version;/src/gwenview-&kde-version;.tar.xz">
-  <!ENTITY gwenview-md5sum        "95323d433a1c9b38b917dd3a743aefa1">
+  <!ENTITY gwenview-download-http "&kde-download-http;&kde-version;/src/gwenview-&kde-version;.tar.xz">
+  <!ENTITY gwenview-download-ftp  "&kde-download-ftp;&kde-version;/src/gwenview-&kde-version;.tar.xz">
+  <!ENTITY gwenview-md5sum        "d81c71f953f7c41dce19c8c3df338ebf">
   <!ENTITY gwenview-size          "2.0 MB">
-  <!ENTITY gwenview-buildsize     "114 MB">
+  <!ENTITY gwenview-buildsize     "25 MB">
   <!ENTITY gwenview-time          "1.6 SBU">
 ]>
@@ -100,5 +100,5 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -109,12 +109,5 @@
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -131,5 +124,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -137,9 +130,9 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-gwenview">
+      <varlistentry id="gwenview-prog">
         <term><command>gwenview</command></term>
         <listitem>
-          <para>is a testing utility for gwenview-generated build trees.</para>
-          <indexterm zone="a-gwenview gwenview">
+          <para>is the KDE image viewer.</para>
+          <indexterm zone="gwenview gwenview-prog">
             <primary sortas="b-gwenview">gwenview</primary>
           </indexterm>
@@ -148,5 +141,5 @@
 
     </variablelist>
--->
+
   </sect2>
 
Index: kde/add/kate.xml
===================================================================
--- kde/add/kate.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/add/kate.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY kate-download-http "&kde-download-http;&kde-version;/src/kate-&kde-version;.tar.xz">
   <!ENTITY kate-download-ftp  "&kde-download-ftp;&kde-version;/src/kate-&kde-version;.tar.xz">
-  <!ENTITY kate-md5sum        "db0c2696d6a9951a59a8d4d25c46c32e">
+  <!ENTITY kate-md5sum        "6c2d931aa590547b259ddd71983dcf46">
   <!ENTITY kate-size          "2.1 MB">
-  <!ENTITY kate-buildsize     "325 MB">
+  <!ENTITY kate-buildsize     "80 MB">
   <!ENTITY kate-time          "4.6 SBU">
 ]>
@@ -74,12 +74,4 @@
     </para>
 
-<!--    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    </para>
--->
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/kate"/>
@@ -97,5 +89,5 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -106,12 +98,5 @@
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -131,5 +116,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -137,10 +122,10 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-kate">
+      <varlistentry id="kate-prog">
         <term><command>kate</command></term>
         <listitem>
-          <para>is a testing utility for kate-generated build trees.</para>
-          <indexterm zone="a-kate kate">
-            <primary sortas="b-kate">kdeutils</primary>
+          <para>is the KDE text editor.</para>
+          <indexterm zone="kate kate-prog">
+            <primary sortas="b-kate">kate</primary>
           </indexterm>
         </listitem>
@@ -148,5 +133,5 @@
 
     </variablelist>
--->
+
   </sect2>
 
Index: e/add/kde-base-artwork.xml
===================================================================
--- kde/add/kde-base-artwork.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %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-ftp  "&kde-download-ftp;&kde-version;/src/kde-base-artwork-&kde-version;.tar.xz">
-  <!ENTITY kde-base-artwork-md5sum        "6597d3d52d7fccd18dd83bec14960680">
-  <!ENTITY kde-base-artwork-size          "16.5 MB">
-  <!ENTITY kde-base-artwork-buildsize     "33 MB">
-  <!ENTITY kde-base-artwork-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="kde-base-artwork" xreflabel="kde-base-artwork-&kde-version;">
-  <?dbhtml filename="kde-base-artwork.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Kde-base-artwork-&kde-version;</title>
-
-  <indexterm zone="kde-base-artwork">
-    <primary sortas="a-kde-base-artwork">kde-base-artwork</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kde-base-artwork</title>
-
-    <para>This package provides the default splash screen for KDE.</para>
-
-    &lfs72_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kde-base-artwork-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kde-base-artwork-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kde-base-artwork-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kde-base-artwork-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kde-base-artwork-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kde-base-artwork-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kde-base-artwork-&kdeutils-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kde-base-artwork Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="kdelibs"/>
-    </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    </para>
--->
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kde-base-artwork"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kde-base-artwork</title>
-
-    <para>Install <application>Kde-base-artwork</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
-      ..</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-	<seg>none</seg>
-        <seg>&kde-dir;/share/apps/ksplash/Themes/Default</seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-kde-base-artwork">
-        <term><command>kde-base-artwork</command></term>
-        <listitem>
-          <para>is a testing utility for kde-base-artwork-generated build trees.</para>
-          <indexterm zone="a-kde-base-artwork kde-base-artwork">
-            <primary sortas="b-kde-base-artwork">kdeutils</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: kde/add/kdeadmin.xml
===================================================================
--- kde/add/kdeadmin.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/add/kdeadmin.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY kdeadmin-download-http "&kde-download-http;&kde-version;/src/kdeadmin-&kde-version;.tar.xz">
   <!ENTITY kdeadmin-download-ftp  "&kde-download-ftp;&kde-version;/src/kdeadmin-&kde-version;.tar.xz">
-  <!ENTITY kdeadmin-md5sum        "5a6a4a828299c4b678e408a146ce5ba6">
+  <!ENTITY kdeadmin-md5sum        "fe6917aa5e03adca25b7ccbdbf2e0097">
   <!ENTITY kdeadmin-size          "1.2 MB">
-  <!ENTITY kdeadmin-buildsize     "123 MB">
+  <!ENTITY kdeadmin-buildsize     "25 MB">
   <!ENTITY kdeadmin-time          "2.2 SBU">
 ]>
@@ -102,5 +102,5 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -111,12 +111,5 @@
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -133,22 +126,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-kdeadmin">
-        <term><command>kdeadmin</command></term>
-        <listitem>
-          <para>is a testing utility for kdeadmin-generated build trees.</para>
-          <indexterm zone="a-kdeadmin kdeadmin">
-            <primary sortas="b-kdeadmin">kdeadmin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
   </sect2>
 
Index: kde/add/kdepim-runtime.xml
===================================================================
--- kde/add/kdepim-runtime.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/add/kdepim-runtime.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY kdepim-runtime-download-http "&kde-download-http;&kde-version;/src/kdepim-runtime-&kde-version;.tar.xz">
   <!ENTITY kdepim-runtime-download-ftp  "&kde-download-ftp;&kde-version;/src/kdepim-runtime-&kde-version;.tar.xz">
-  <!ENTITY kdepim-runtime-md5sum        "af25aec36d8ae5f38169324be7c80808">
-  <!ENTITY kdepim-runtime-size          "1.1 MB">
-  <!ENTITY kdepim-runtime-buildsize     "396 MB">
+  <!ENTITY kdepim-runtime-md5sum        "9bfc13a1180f58024e9baa881c4d6743">
+  <!ENTITY kdepim-runtime-size          "1.2 MB">
+  <!ENTITY kdepim-runtime-buildsize     "90 MB">
   <!ENTITY kdepim-runtime-time          "7.2 SBU">
 ]>
@@ -72,9 +72,5 @@
     <xref linkend="kdepimlibs"/>
     </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    </para>
--->
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -98,5 +94,5 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -107,12 +103,5 @@
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -133,22 +122,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-kdepim">
-        <term><command>kdepim</command></term>
-        <listitem>
-          <para>is a testing utility for kdepim-runtime-generated build trees.</para>
-          <indexterm zone="a-kdepim kdepim">
-            <primary sortas="b-kdepim">kdepim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
   </sect2>
 
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/add/kdepim.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY kdepim-download-http "&kde-download-http;&kde-version;/src/kdepim-&kde-version;.tar.xz">
   <!ENTITY kdepim-download-ftp  "&kde-download-ftp;&kde-version;/src/kdepim-&kde-version;.tar.xz">
-  <!ENTITY kdepim-md5sum        "9d9fe1a09aba774f3ff71dde0aaefc4c">
-  <!ENTITY kdepim-size          "14.4 MB">
-  <!ENTITY kdepim-buildsize     "1.5 GB">
+  <!ENTITY kdepim-md5sum        "0f4c057c76aec1fbf8c8934cacf49845">
+  <!ENTITY kdepim-size          "14 MB">
+  <!ENTITY kdepim-buildsize     "300 MB">
   <!ENTITY kdepim-time          "19.2 SBU">
 ]>
@@ -72,5 +72,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdepimlibs"/>
+    <xref linkend="kdepim-runtime"/>
     </para>
 
@@ -97,4 +97,7 @@
     <title>Installation of Kdepim</title>
 
+<!-- This should be added in automoc4 instructions. I don't like that some package
+     modifies already installed one.
+
     <para>The building proces of <application>Kdepim</application> is known to
     fail when compiling with recent versions of
@@ -103,13 +106,16 @@
 
 <screen role="root"><userinput>sed -i 's/@_moc_cdefs@/@_moc_cdefs@;BOOST_TT_HAS_OPERATOR_HPP_INCLUDED/' $QTDIR/lib/automoc4/automoc4.files.in &amp;&amp;
-sed -i 's/@_moc_defs@/@_moc_defs@ -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED/' $QTDIR/lib/automoc4/automoc4.files.in</userinput></screen>
+sed -i 's/@_moc_defs@/@_moc_defs@ -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED/' $QTDIR/lib/automoc4/automoc4.files.in</userinput></screen> -->
     
-    <para>Now, install <application>Kdepim</application> by running
+    <para>Install <application>Kdepim</application> by running
     the following commands:</para>
 
-<screen><userinput>mkdir build &amp;&amp;
+<screen><userinput>sed -e "s@DEBUG_AREA=5151 )@&amp;\n\nadd_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED )@g" \
+    -i kleopatra/CMakeLists.txt &amp;&amp;
+mkdir build &amp;&amp;
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DSYSCONF_INSTALL_DIR=/etc \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -120,12 +126,5 @@
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -150,22 +149,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-kdepim">
-        <term><command>kdepim</command></term>
-        <listitem>
-          <para>is a testing utility for kdepim-generated build trees.</para>
-          <indexterm zone="a-kdepim kdepim">
-            <primary sortas="b-kdepim">kdepim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
   </sect2>
 
Index: kde/add/kdeplasma-addons.xml
===================================================================
--- kde/add/kdeplasma-addons.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/add/kdeplasma-addons.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY kdeplasma-addons-download-http "&kde-download-http;&kde-version;/src/kdeplasma-addons-&kde-version;.tar.xz">
   <!ENTITY kdeplasma-addons-download-ftp  "&kde-download-ftp;&kde-version;/src/kdeplasma-addons-&kde-version;.tar.xz">
-  <!ENTITY kdeplasma-addons-md5sum        "8ad3a80ffd15ad54c37dd0b984ef9c84">
+  <!ENTITY kdeplasma-addons-md5sum        "50d05e54dbe395073f455f82245535cc">
   <!ENTITY kdeplasma-addons-size          "1.7 MB">
-  <!ENTITY kdeplasma-addons-buildsize     "399 MB">
+  <!ENTITY kdeplasma-addons-buildsize     "8.5 MB">
   <!ENTITY kdeplasma-addons-time          "5.1 SBU">
 ]>
@@ -73,12 +73,9 @@
     <xref linkend="kdepimlibs"/>
     </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    </para>
--->
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
     <xref linkend="libkexiv2"/>,
+    <xref linkend="ibus"/>,
     <ulink url="http://edu.kde.org/marble/">Marble</ulink> (for the desktop globe wallpaper),
     <ulink url="http://eigen.tuxfamily.org/">Eigen</ulink> (for the Mandelbrot wallpaper plugin),
@@ -102,5 +99,5 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -111,12 +108,5 @@
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -135,22 +125,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-kdeplasma-addons">
-        <term><command>kdeplasma-addons</command></term>
-        <listitem>
-          <para>is a testing utility for kdeplasma-addons-generated build trees.</para>
-          <indexterm zone="a-kdeplasma-addons kdeplasma-addons">
-            <primary sortas="b-kdeplasma-addons">kdeplasma-addons</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
   </sect2>
 
Index: kde/add/kmix.xml
===================================================================
--- kde/add/kmix.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/add/kmix.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY kmix-download-http "&kde-download-http;&kde-version;/src/kmix-&kde-version;.tar.xz">
   <!ENTITY kmix-download-ftp  "&kde-download-ftp;&kde-version;/src/kmix-&kde-version;.tar.xz">
-  <!ENTITY kmix-md5sum        "1ac7ba5f220e2d032aa765961082519d">
+  <!ENTITY kmix-md5sum        "3dcd75e3b2ff3a69ec200f4a5d60d24f">
   <!ENTITY kmix-size          "300 KB">
-  <!ENTITY kmix-buildsize     "65 MB">
+  <!ENTITY kmix-buildsize     "15 MB">
   <!ENTITY kmix-time          "0.3 SBU">
 ]>
@@ -93,5 +93,5 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -102,12 +102,5 @@
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -125,5 +118,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -131,9 +124,9 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-kmix">
+      <varlistentry id="kmix-prog">
         <term><command>kmix</command></term>
         <listitem>
-          <para>is a testing utility for kmix-generated build trees.</para>
-          <indexterm zone="a-kmix kmix">
+          <para>is the KDE Volume Control.</para>
+          <indexterm zone="kmix kmix-prog">
             <primary sortas="b-kmix">kmix</primary>
           </indexterm>
@@ -142,5 +135,5 @@
 
     </variablelist>
--->
+
   </sect2>
 
Index: kde/add/konsole.xml
===================================================================
--- kde/add/konsole.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/add/konsole.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY konsole-download-http "&kde-download-http;&kde-version;/src/konsole-&kde-version;.tar.xz">
   <!ENTITY konsole-download-ftp  "&kde-download-ftp;&kde-version;/src/konsole-&kde-version;.tar.xz">
-  <!ENTITY konsole-md5sum        "5e742f035f8238d0ba24f5e51c71e627">
-  <!ENTITY konsole-size          "433 KB">
-  <!ENTITY konsole-buildsize     "54 MB">
+  <!ENTITY konsole-md5sum        "2e1bea3c818df37bf0ef8129440c66e6">
+  <!ENTITY konsole-size          "436 KB">
+  <!ENTITY konsole-buildsize     "15 MB">
   <!ENTITY konsole-time          "0.7 SBU">
 ]>
@@ -71,13 +71,5 @@
     <xref linkend="kde-baseapps"/>
     </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    </para>
--->
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/konsole"/>
@@ -95,5 +87,5 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -104,12 +96,5 @@
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -128,5 +113,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -134,9 +119,9 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-konsole">
+      <varlistentry id="konsole-prog">
         <term><command>konsole</command></term>
         <listitem>
-          <para>is a testing utility for konsole-generated build trees.</para>
-          <indexterm zone="a-konsole konsole">
+          <para>is the KDE terminal emulator.</para>
+          <indexterm zone="konsole konsole-prog">
             <primary sortas="b-konsole">konsole</primary>
           </indexterm>
@@ -145,5 +130,5 @@
 
     </variablelist>
--->
+
   </sect2>
 
Index: kde/add/libkcddb.xml
===================================================================
--- kde/add/libkcddb.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/add/libkcddb.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY libkcddb-download-http "&kde-download-http;&kde-version;/src/libkcddb-&kde-version;.tar.xz">
   <!ENTITY libkcddb-download-ftp  "&kde-download-ftp;&kde-version;/src/libkcddb-&kde-version;.tar.xz">
-  <!ENTITY libkcddb-md5sum        "a05e5ee4a89d601ac09ff023bba55ce4">
+  <!ENTITY libkcddb-md5sum        "b1e0760c6ff825629cc1500f203ee2aa">
   <!ENTITY libkcddb-size          "156 KB">
-  <!ENTITY libkcddb-buildsize     "22 MB">
+  <!ENTITY libkcddb-buildsize     "5.5 MB">
   <!ENTITY libkcddb-time          "0.3 SBU">
 ]>
@@ -95,5 +95,5 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
Index: kde/add/libkexiv2.xml
===================================================================
--- kde/add/libkexiv2.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/add/libkexiv2.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY libkexiv2-download-http "&kde-download-http;&kde-version;/src/libkexiv2-&kde-version;.tar.xz">
   <!ENTITY libkexiv2-download-ftp  "&kde-download-ftp;&kde-version;/src/libkexiv2-&kde-version;.tar.xz">
-  <!ENTITY libkexiv2-md5sum        "95fa4cc2245c226fc64473b0eda82260">
+  <!ENTITY libkexiv2-md5sum        "079e048aba5fd76ea5ba39871fc61b19">
   <!ENTITY libkexiv2-size          "132 KB">
-  <!ENTITY libkexiv2-buildsize     "20 MB">
+  <!ENTITY libkexiv2-buildsize     "6.5 MB">
   <!ENTITY libkexiv2-time          "0.4 SBU">
 ]>
@@ -73,13 +73,5 @@
     <xref linkend="exiv2"/>
     </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    </para>
--->
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/libkexiv2"/>
@@ -97,5 +89,5 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -106,12 +98,5 @@
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -119,5 +104,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
@@ -129,22 +114,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-ark">
-        <term><command>ark</command></term>
-        <listitem>
-          <para>is a testing utility for ark-generated build trees.</para>
-          <indexterm zone="a-ark ark">
-            <primary sortas="b-ark">ark</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
   </sect2>
 
Index: kde/add/okular.xml
===================================================================
--- kde/add/okular.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/add/okular.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY okular-download-http "&kde-download-http;&kde-version;/src/okular-&kde-version;.tar.xz">
   <!ENTITY okular-download-ftp  "&kde-download-ftp;&kde-version;/src/okular-&kde-version;.tar.xz">
-  <!ENTITY okular-md5sum        "284ed7d7e29601905a0d943ef2ca253a">
+  <!ENTITY okular-md5sum        "c95ada3fb597a6f3e727b4bbe92de087">
   <!ENTITY okular-size          "1.4 MB">
-  <!ENTITY okular-buildsize     "137 MB">
+  <!ENTITY okular-buildsize     "30 MB">
   <!ENTITY okular-time          "2.1 SBU">
 ]>
@@ -110,5 +110,5 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -119,12 +119,5 @@
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -142,5 +135,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -148,9 +141,9 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-okular">
+      <varlistentry id="okular-prog">
         <term><command>okular</command></term>
         <listitem>
-          <para>is a testing utility for okular-generated build trees.</para>
-          <indexterm zone="a-okular okular">
+          <para>is the KDE document viewer.</para>
+          <indexterm zone="okular okular-prog">
             <primary sortas="b-okular">okular</primary>
           </indexterm>
@@ -159,5 +152,5 @@
 
     </variablelist>
--->
+
   </sect2>
 
Index: kde/core/core.xml
===================================================================
--- kde/core/core.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/core/core.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -28,9 +28,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdelibs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-kde-agent.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nepomuk-core.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdepimlibs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kactivities.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nepomuk-core.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-runtime.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-baseapps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-base-artwork.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-workspace.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="config.xml"/>
Index: kde/core/kactivities.xml
===================================================================
--- kde/core/kactivities.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/core/kactivities.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY kactivities-download-http "&kde-download-http;&kde-version;/src/kactivities-&kde-version;.tar.xz">
   <!ENTITY kactivities-download-ftp  "&kde-download-ftp;&kde-version;/src/kactivities-&kde-version;.tar.xz">
-  <!ENTITY kactivities-md5sum        "8cd41377e90b15e630f638a314829c7a">
-  <!ENTITY kactivities-size          "84 KB">
-  <!ENTITY kactivities-buildsize     "49 MB">
+  <!ENTITY kactivities-md5sum        "3fd44af91801291287ebd72ed6444744">
+  <!ENTITY kactivities-size          "88 KB">
+  <!ENTITY kactivities-buildsize     "8.6 MB">
   <!ENTITY kactivities-time          "0.5 SBU">
 ]>
@@ -71,13 +71,5 @@
     <xref linkend="kdelibs"/> 
     </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    </para>
--->
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/kactivities"/>
@@ -92,8 +84,9 @@
     commands:</para>
 
+<!-- Nothing in sysconfdir here, too -->
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -104,12 +97,5 @@
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -127,22 +113,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-kactivities">
-        <term><command>kactivities</command></term>
-        <listitem>
-          <para>is a testing utility for kactivities-generated build trees.</para>
-          <indexterm zone="a-kactivities kactivities">
-            <primary sortas="b-kactivities">kdelibs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
   </sect2>
 
Index: kde/core/kde-base-artwork.xml
===================================================================
--- kde/core/kde-base-artwork.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
+++ kde/core/kde-base-artwork.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %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-ftp  "&kde-download-ftp;&kde-version;/src/kde-base-artwork-&kde-version;.tar.xz">
+  <!ENTITY kde-base-artwork-md5sum        "99f74baa84816fd5f757317f22e423a1">
+  <!ENTITY kde-base-artwork-size          "16 MB">
+  <!ENTITY kde-base-artwork-buildsize     "35 MB">
+  <!ENTITY kde-base-artwork-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="kde-base-artwork" xreflabel="kde-base-artwork-&kde-version;">
+  <?dbhtml filename="kde-base-artwork.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Kde-base-artwork-&kde-version;</title>
+
+  <indexterm zone="kde-base-artwork">
+    <primary sortas="a-kde-base-artwork">kde-base-artwork</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Kde-base-artwork</title>
+
+    <para>This package provides the default splash screen for KDE.</para>
+
+    &lfs72_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&kde-base-artwork-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&kde-base-artwork-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &kde-base-artwork-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &kde-base-artwork-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &kde-base-artwork-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &kde-base-artwork-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Kde-base-artwork Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+    <xref linkend="kdelibs"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/kde-base-artwork"/>
+    </para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Kde-base-artwork</title>
+
+    <para>Install <application>Kde-base-artwork</application> by running
+    the following commands:</para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; ..</userinput></screen>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>none</seg>
+	<seg>none</seg>
+        <seg>&kde-dir;/share/apps/ksplash/Themes/Default</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: kde/core/kde-baseapps.xml
===================================================================
--- kde/core/kde-baseapps.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/core/kde-baseapps.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY kde-baseapps-download-http "&kde-download-http;&kde-version;/src/kde-baseapps-&kde-version;.tar.xz">
   <!ENTITY kde-baseapps-download-ftp  "&kde-download-ftp;&kde-version;/src/kde-baseapps-&kde-version;.tar.xz">
-  <!ENTITY kde-baseapps-md5sum        "a5782bc15ffd720fedce48e7538db5d7">
+  <!ENTITY kde-baseapps-md5sum        "510440a4efc787e3fbb7d13e24ce821c">
   <!ENTITY kde-baseapps-size          "2.5 MB">
-  <!ENTITY kde-baseapps-buildsize     "398 MB">
+  <!ENTITY kde-baseapps-buildsize     "85 MB">
   <!ENTITY kde-baseapps-time          "5.2 SBU">
 ]>
@@ -73,10 +73,5 @@
     <xref linkend="kdelibs"/>
     </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="strigi"/>
-    </para>
--->
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -100,5 +95,5 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -109,12 +104,5 @@
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -137,5 +125,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -143,16 +131,31 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-kde-baseapps">
-        <term><command>kde-baseapps</command></term>
+      <varlistentry id="kbookmarkmerger">
+        <term><command>kbookmarkmerger</command></term>
         <listitem>
-          <para>is a testing utility for kde-baseapps-generated build trees.</para>
-          <indexterm zone="a-kde-baseapps kde-baseapps">
-            <primary sortas="b-kde-baseapps">kdelibs</primary>
+          <para>
+            is a program for merging a given set of bookmarks into the
+            user's set of bookmarks.
+          </para>
+          <indexterm zone="kde-baseapps kbookmarkmerger">
+            <primary sortas="b-kbookmarkmerger">kbookmarkmerger</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="kfind">
+        <term><command>kfind</command></term>
+        <listitem>
+          <para>
+            is the file find utility for KDE.
+          </para>
+          <indexterm zone="kde-baseapps kfind">
+            <primary sortas="b-kfind">kfind</primary>
+          </indexterm>  
+        </listitem>
+      </varlistentry>
+
     </variablelist>
--->
+
   </sect2>
 
Index: kde/core/kde-runtime.xml
===================================================================
--- kde/core/kde-runtime.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/core/kde-runtime.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY kde-runtime-download-http "&kde-download-http;&kde-version;/src/kde-runtime-&kde-version;.tar.xz">
   <!ENTITY kde-runtime-download-ftp  "&kde-download-ftp;&kde-version;/src/kde-runtime-&kde-version;.tar.xz">
-  <!ENTITY kde-runtime-md5sum        "7fcd028d15c03d68409480fad473b994">
-  <!ENTITY kde-runtime-size          "6.3 MB">
-  <!ENTITY kde-runtime-buildsize     "438 MB">
+  <!ENTITY kde-runtime-md5sum        "e7b17cb6f59d8c36a09ac9862936fd44">
+  <!ENTITY kde-runtime-size          "6.2 MB">
+  <!ENTITY kde-runtime-buildsize     "125 MB">
   <!ENTITY kde-runtime-time          "7.5 SBU">
 ]>
@@ -57,5 +57,4 @@
     </itemizedlist>
 
-
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
@@ -84,4 +83,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+    <xref linkend="gdb"/>,
     <xref linkend="pulseaudio"/>, 
     <xref linkend="xine-lib"/>, 
@@ -111,5 +111,6 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DSYSCONF_INSTALL_DIR=/etc \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -117,13 +118,6 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
- <para><option>patch -Np1 -i ../kde-runtime-&kde-version;-rpc_fix-1.patch</option>:
- This patch fixes linking to <application>libtirpc</application>.</para>
+<screen role="root"><userinput>make install &amp;&amp;
+ln -s ../lib/kde4/libexec/kdesu &kde-dir;/bin/kdesu</userinput></screen>
 
   </sect2>
@@ -138,5 +132,5 @@
 
       <seglistitem>
-        <seg>kcmshell4, kde-cp, kde-mv, kde-open, kde4, kde4-menu,
+        <seg>kcmshell4, kde-cp, kde-mv, kde-open, kdesu, kde4, kde4-menu,
         kdebugdialog, keditfiletype, kfile4, kglobalaccel, khelpcenter,
         khotnewstuff-upload, khotnewstuff4, kiconfinder, kioclient,
@@ -149,5 +143,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -155,10 +149,10 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-kde-runtime">
-        <term><command>kde-runtime</command></term>
+      <varlistentry id="kdesu">
+        <term><command>kdesu</command></term>
         <listitem>
-          <para>is a testing utility for kde-runtime-generated build trees.</para>
-          <indexterm zone="a-kde-runtime kde-runtime">
-            <primary sortas="b-kde-runtime">kdelibs</primary>
+          <para>Runs a program with elevated privileges.</para>
+          <indexterm zone="kde-runtime kdesu">
+            <primary sortas="b-kdesu">kdesu</primary>
           </indexterm>
         </listitem>
@@ -166,5 +160,5 @@
 
     </variablelist>
--->
+
   </sect2>
 
Index: kde/core/kde-workspace.xml
===================================================================
--- kde/core/kde-workspace.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/core/kde-workspace.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY kde-workspace-download-http "&kde-download-http;&kde-version;/src/kde-workspace-&kde-version;.tar.xz">
   <!ENTITY kde-workspace-download-ftp  "&kde-download-ftp;&kde-version;/src/kde-workspace-&kde-version;.tar.xz">
-  <!ENTITY kde-workspace-md5sum        "7e0ac76dda7e44895df6603504b24872">
-  <!ENTITY kde-workspace-size          "22.3 MB">
-  <!ENTITY kde-workspace-buildsize     "1.4 GB">
+  <!ENTITY kde-workspace-md5sum        "139bdce88559ddc638ea616a6a443cf6">
+  <!ENTITY kde-workspace-size          "22 MB">
+  <!ENTITY kde-workspace-buildsize     "375 MB">
   <!ENTITY kde-workspace-time          "20 SBU">
 ]>
@@ -109,4 +109,16 @@
     <title>Installation of Kde-workspace</title>
 
+    <para>
+      It is recommended to have a dedicated user and group to take
+      control of the <command>kdm</command> daemon after it is
+      started. Issue the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>groupadd -g 37 kdm &amp;&amp;
+useradd -c "KDM Daemon Owner" -d /var/lib/kdm -g kdm \
+        -u 37 -s /bin/false kdm &amp;&amp;
+install -o kdm -g kdm -dm755 /var/lib/kdm</userinput></screen>
+
     <para>Install <application>Kde-workspace</application> by running the following
     commands:</para>
@@ -115,5 +127,6 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DSYSCONF_INSTALL_DIR=/etc \
+      -DCMAKE_BUILD_TYPE=Release \
       -DPYTHON_SITE_PACKAGES_INSTALL_DIR=/usr/lib/python2.7/site-packages \
       .. &amp;&amp;
@@ -122,5 +135,8 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+mkdir -p /usr/share/xsessions &amp;&amp;
+ln -sf &kde-dir;/share/apps/kdm/sessions/kde-plasma.desktop \
+       /usr/share/xsessions/kde-plasma.desktop</userinput></screen>
 
   </sect2>
@@ -131,4 +147,58 @@
     <para><option>-DPYTHON_SITE_PACKAGES_INSTALL...</option>: This option is 
     set to install the KDE Python objects in the correct place.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring KDE Workspace</title>
+
+    <sect3>
+      <title>Linux PAM Configuration</title>
+
+      <para>If you have built <application>KDE Workspace</application> with
+      <application>Linux PAM</application> support, create necesary 
+      configuration files by running the following commands as the
+      <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/pam.d/kde &lt;&lt; "EOF" &amp;&amp;
+# Begin /etc/pam.d/kde
+
+auth     requisite      pam_nologin.so
+auth     required       pam_env.so
+
+auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
+auth     include        system-auth
+
+account  include        system-account
+password include        system-password
+session  include        system-session
+
+# End /etc/pam.d/kde
+EOF
+cat &gt; /etc/pam.d/kde-np &lt;&lt; "EOF" &amp;&amp;
+# Begin /etc/pam.d/kde-np
+
+auth     requisite      pam_nologin.so
+auth     required       pam_env.so
+
+auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
+auth     required       pam_permit.so
+
+account  include        system-account
+password include        system-password
+session  include        system-session
+
+# End /etc/pam.d/kde-np
+EOF
+cat &gt; /etc/pam.d/kscreensaver &lt;&lt; "EOF"
+# Begin /etc/pam.d/kscreensaver
+
+auth    include system-auth
+account include system-account
+
+# End /etc/pam.d/kscreensaver
+EOF</userinput></screen>
+
+    </sect3>
 
   </sect2>
@@ -159,22 +229,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-kde4baseworkspace">
-        <term><command>kde4baseworkspace</command></term>
-        <listitem>
-          <para>is a testing utility for kde4baseworkspace-generated build trees.</para>
-          <indexterm zone="a-kde4baseworkspace kde4baseworkspace">
-            <primary sortas="b-kde4baseworkspace">kdelibs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
+
   </sect2>
   
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/core/kdelibs.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY kdelibs-download-http "&kde-download-http;&kde-version;/src/kdelibs-&kde-version;.tar.xz">
   <!ENTITY kdelibs-download-ftp  "&kde-download-ftp;&kde-version;/src/kdelibs-&kde-version;.tar.xz">
-  <!ENTITY kdelibs-md5sum        "91e9cf8446491e7e852b04be7a22c61c">
-  <!ENTITY kdelibs-size          "11.7 MB">
-  <!ENTITY kdelibs-buildsize     "1.7 GB">
+  <!ENTITY kdelibs-md5sum        "2155d7ae075a1c7e9c6398b381c67177">
+  <!ENTITY kdelibs-size          "12 MB">
+  <!ENTITY kdelibs-buildsize     "390 MB">
   <!ENTITY kdelibs-time          "24 SBU">
 ]>
@@ -106,6 +106,5 @@
     <ulink url="http://www.herqq.org/">HUPnP</ulink>, 
     <xref linkend="mitkrb"/> and
-    <ulink url="http://www.openexr.com/">OpenEXR</ulink>
-    
+    <ulink url="http://www.openexr.com/">OpenEXR</ulink>    
     </para>
 
@@ -119,11 +118,21 @@
     <title>Installation of Kdelibs</title>
 
+    <para>Fix file conflicts with <application>GNOME Menus</application> by running
+    the following commands:</para>
+
+<screen><userinput>sed -e "s@{SYSCONF_INSTALL_DIR}/xdg/menus@&amp; RENAME kde-applications.menu@g" \
+    -i kded/CMakeLists.txt &amp;&amp;
+sed -i "s@applications.menu@kde-&amp;@g" kded/kbuildsycoca.cpp</userinput></screen>
+
     <para>Install <application>Kdelibs</application> by running the following
     commands:</para>
 
+<!-- I wouldn't recommend installing D-Bus configuration files outside of /etc if kde-dir is /usr,
+     maybe kde-etc-dir should be introduced? -->
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DSYSCONF_INSTALL_DIR=/etc \
+      -DCMAKE_BUILD_TYPE=Release \
       -DDOCBOOKXML_CURRENTDTD_DIR=/usr/share/xml/docbook/xml-dtd-&DocBook-version; \
       .. &amp;&amp;
@@ -139,9 +148,12 @@
     <title>Command Explanations</title>
 
-    <para><option>-DSYSCONF_INSTALL_DIR=/etc/kde</option>: This option is set to
-    install configuration files in /etc.</para>
-    <para><option>-DDOCBOOKXML_CURRENTDTD_DIR=...</option>: This option is used to
-    find the DTDs.</para>
-          
+    <para><option>-DSYSCONF_INSTALL_DIR=/etc</option>: This switch is used to install
+    configuration files in /etc.</para>
+
+    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to apply
+    higher level of compiler optimizations.</para>
+
+    <para><option>-DDOCBOOKXML_CURRENTDTD_DIR=...</option>: This switch is used to
+    tell <command>cmake</command> where to find the XML DTDs.</para>          
 
   </sect2>
@@ -166,5 +178,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -172,10 +184,159 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-kde4libs">
-        <term><command>kde4libs</command></term>
-        <listitem>
-          <para>is a testing utility for kde4libs-generated build trees.</para>
-          <indexterm zone="a-kde4libs kde4libs">
-            <primary sortas="b-kde4libs">kdelibs</primary>
+      <varlistentry id="checkXML">
+        <term><command>checkXML</command></term>
+        <listitem>
+          <para>
+            is a tool used to check for syntax errors in KDE DocBook
+            XML files.
+          </para>
+          <indexterm zone="kdelibs checkXML">
+            <primary sortas="b-checkXML">checkXML</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kbuildsycoca4">
+        <term><command>kbuildsycoca4</command></term>
+        <listitem>
+          <para>
+            is used to rebuild the system configuration cache.
+          </para>
+          <indexterm zone="kdelibs kbuildsycoca4">
+            <primary sortas="b-kbuildsycoca4">kbuildsycoca4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kconfig_compiler">
+        <term><command>kconfig_compiler</command></term>
+        <listitem>
+          <para>
+            is the KDE configuration compiler.
+          </para>
+          <indexterm zone="kdelibs kconfig_compiler">
+            <primary sortas="b-kconfig_compiler">kconfig_compiler</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kcookiejar4">
+        <term><command>kcookiejar4</command></term>
+        <listitem>
+          <para>
+            is the KDE HTTP cookie daemon.
+          </para>
+          <indexterm zone="kdelibs kcookiejar4">
+            <primary sortas="b-kcookiejar4">kcookiejar4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kde4-config">
+        <term><command>kde4-config</command></term>
+        <listitem>
+          <para>
+            is used to print the KDE installation paths.
+          </para>
+          <indexterm zone="kdelibs kde4-config">
+            <primary sortas="b-kde4-config">kde4-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kded4">
+        <term><command>kded4</command></term>
+        <listitem>
+          <para>
+            is the KDE daemon.
+          </para>
+          <indexterm zone="kdelibs kded4">
+            <primary sortas="b-kded4">kded4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kdeinit4">
+        <term><command>kdeinit4</command></term>
+        <listitem>
+          <para>
+            is the KDE process launcher.
+          </para>
+          <indexterm zone="kdelibs kdeinit4">
+            <primary sortas="b-kdeinit4">kdeinit4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kjs">
+        <term><command>kjs</command></term>
+        <listitem>
+          <para>
+            is the KDE ECMAScript/JavaScript engine.
+          </para>
+          <indexterm zone="kdelibs kjs">
+            <primary sortas="b-kjs">kjs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kjscmd">
+        <term><command>kjscmd</command></term>
+        <listitem>
+          <para>
+            is a tool used for launching KJSEmbed scripts from
+            the command line.
+          </para>
+          <indexterm zone="kdelibs kjscmd">
+            <primary sortas="b-kjscmd">kjscmd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kross">
+        <term><command>kross</command></term>
+        <listitem>
+          <para>
+            is the KDE application used to run kross scripts.
+          </para>
+          <indexterm zone="kdelibs kross">
+            <primary sortas="b-kross">kross</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="makekdewidgets">
+        <term><command>makekdewidgets</command></term>
+        <listitem>
+          <para>
+            is used to build Qt widget plugins from an ini style
+            description file.
+          </para>
+          <indexterm zone="kdelibs makekdewidgets">
+            <primary sortas="b-makekdewidgets">makekdewidgets</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="meinproc4">
+        <term><command>meinproc4</command></term>
+        <listitem>
+          <para>
+            is used to convert DocBook files to HTML.
+          </para>
+          <indexterm zone="kdelibs meinproc4">
+            <primary sortas="b-meinproc4">meinproc4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="preparetips">
+        <term><command>preparetips</command></term>
+        <listitem>
+          <para>
+            is a script used to extract the text from a tips file.
+          </para>
+          <indexterm zone="kdelibs preparetips">
+            <primary sortas="b-preparetips">preparetips</primary>
           </indexterm>
         </listitem>
@@ -183,5 +344,5 @@
 
     </variablelist>
--->
+
   </sect2>
 
Index: kde/core/kdepimlibs.xml
===================================================================
--- kde/core/kdepimlibs.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/core/kdepimlibs.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY kdepimlibs-download-http "&kde-download-http;&kde-version;/src/kdepimlibs-&kde-version;.tar.xz">
   <!ENTITY kdepimlibs-download-ftp  "&kde-download-ftp;&kde-version;/src/kdepimlibs-&kde-version;.tar.xz">
-  <!ENTITY kdepimlibs-md5sum        "1050770487d22bff8a44636a38172228">
+  <!ENTITY kdepimlibs-md5sum        "0ee906b58e3a8e8acd6f03482ea8a9bb">
   <!ENTITY kdepimlibs-size          "2.6 MB">
-  <!ENTITY kdepimlibs-buildsize     "518 MB">
+  <!ENTITY kdepimlibs-buildsize     "135 MB">
   <!ENTITY kdepimlibs-time          "7.5 SBU">
 ]>
@@ -101,8 +101,9 @@
     commands:</para>
 
+<!-- Again, nothing in sysconfdir -->
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -113,12 +114,5 @@
 
   </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -136,22 +130,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-kdepimlibs">
-        <term><command>kdepimlibs</command></term>
-        <listitem>
-          <para>is a testing utility for kdepimlibs-generated build trees.</para>
-          <indexterm zone="a-kdepimlibs kdepimlibs">
-            <primary sortas="b-kdepimlibs">kdepimlibs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
   </sect2>
 
Index: kde/core/nepomuk-core.xml
===================================================================
--- kde/core/nepomuk-core.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/core/nepomuk-core.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY nepomuk-core-download-http "&kde-download-http;&kde-version;/src/nepomuk-core-&kde-version;.tar.xz">
   <!ENTITY nepomuk-core-download-ftp  "&kde-download-ftp;&kde-version;/src/nepomuk-core-&kde-version;.tar.xz">
-  <!ENTITY nepomuk-core-md5sum        "19cedfd106f911a77f21b72d60afb730">
-  <!ENTITY nepomuk-core-size          "374 KB">
-  <!ENTITY nepomuk-core-buildsize     "166 MB">
+  <!ENTITY nepomuk-core-md5sum        "0182ca4735278484c9b78ec5ecf0b825">
+  <!ENTITY nepomuk-core-size          "384 KB">
+  <!ENTITY nepomuk-core-buildsize     "35 MB">
   <!ENTITY nepomuk-core-time          "0.3 SBU">
 ]>
@@ -88,8 +88,9 @@
     commands:</para>
 
+<!-- Nothing is installed in sysconfdir ... -->
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc/kde \
+      -DCMAKE_BUILD_TYPE=Release \
       .. &amp;&amp;
 make</userinput></screen>
@@ -100,14 +101,4 @@
 
   </sect2>
-
-<!--  
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
- <para><option>patch -Np1 -i ../kde-runt...</option>: This patch fixes linking 
- to <application>libtirpc</application>.</para>
-
-  </sect2>
--->
 
   <sect2 role="content">
@@ -129,22 +120,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-nepomuk-core">
-        <term><command>nepomuk-core</command></term>
-        <listitem>
-          <para>is a testing utility for nepomuk-core-generated build trees.</para>
-          <indexterm zone="a-nepomuk-core nepomuk-core">
-            <primary sortas="b-nepomuk-core">kdelibs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
   </sect2>
 
Index: kde/core/oxygen-icons.xml
===================================================================
--- kde/core/oxygen-icons.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ kde/core/oxygen-icons.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -7,7 +7,7 @@
   <!ENTITY oxygen-icons-download-http "&kde-download-http;&kde-version;/src/oxygen-icons-&kde-version;.tar.xz">
   <!ENTITY oxygen-icons-download-ftp  "&kde-download-ftp;&kde-version;/src/oxygen-icons-&kde-version;.tar.xz">
-  <!ENTITY oxygen-icons-md5sum        "96a494bbd2263827e3f870741cd83325">
-  <!ENTITY oxygen-icons-size          "270 MB">
-  <!ENTITY oxygen-icons-buildsize     "411 MB">
+  <!ENTITY oxygen-icons-md5sum        "abb39b10509272a8e7e658f2d5a4e0d3">
+  <!ENTITY oxygen-icons-size          "277 MB">
+  <!ENTITY oxygen-icons-buildsize     "470 MB">
   <!ENTITY oxygen-icons-time          "less than 0.1 SBU">
 ]>
@@ -57,14 +57,4 @@
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/automoc4-&automoc4-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-<!--
     <bridgehead renderas="sect3">Oxygen-icons Dependencies</bridgehead>
 
@@ -73,5 +63,5 @@
     <xref linkend="cmake"/>
     </para>
--->
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/oxygen-icons"/></para>
@@ -95,13 +85,4 @@
   </sect2>
 
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
-
   <sect2 role="content">
     <title>Contents</title>
@@ -110,5 +91,5 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
@@ -119,22 +100,4 @@
     </segmentedlist>
 
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-automoc4">
-        <term><command>automoc4</command></term>
-        <listitem>
-          <para>is a testing utility for automoc4-generated build trees.</para>
-          <indexterm zone="a-automoc4 automoc4">
-            <primary sortas="b-automoc4">automoc4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
   </sect2>
 
Index: postlfs/config/users.xml
===================================================================
--- postlfs/config/users.xml	(revision 92b0b42cddf6f3aa5217e7d7adb2be3ae19f7997)
+++ postlfs/config/users.xml	(revision 6913867754b01efa66696c81a433ab1a96f90d8d)
@@ -89,4 +89,5 @@
         <row><entry>vmailman</entry><entry>35</entry><entry>35</entry></row>
         <row><entry>news    </entry><entry>36</entry><entry>36</entry></row>
+        <row><entry>kdm     </entry><entry>37</entry><entry>37</entry></row>
         <row><entry>mysql   </entry><entry>40</entry><entry>40</entry></row>
         <row><entry>postgres</entry><entry>41</entry><entry>41</entry></row>
