Index: general.ent
===================================================================
--- general.ent	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ general.ent	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -614,5 +614,5 @@
 <!-- Part VII -->
 <!-- Chapters 27-29 -->
-<!ENTITY kde-version                 "4.9.5">
+<!ENTITY kde-version                 "4.10.0">
 <!ENTITY kde-dldir                   "&kde-version;">
 <!ENTITY kde-download-http           "http://download.kde.org/stable/">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ introduction/welcome/changelog.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -49,4 +49,7 @@
       <itemizedlist>
         <listitem>
+          <para>[rthomsen] - KDE 4.10.0.</para>
+        </listitem>
+        <listitem>
           <para>[rthomsen] - Added xcb-util-image 0.3.9 and
           xcb-util-renderutil 0.3.8.</para>
Index: kde/add/ark.xml
===================================================================
--- kde/add/ark.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/add/ark.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,5 +8,5 @@
   <!ENTITY ark-download-ftp  "&kde-download-ftp;&kde-version;/src/ark-&kde-version;.tar.xz">
   <!ENTITY ark-md5sum        "17d1c8efe0095ce57310f4873cd9a730">
-  <!ENTITY ark-size          "236 KB">
+  <!ENTITY ark-size          "234 KB">
   <!ENTITY ark-buildsize     "9.5 MB">
   <!ENTITY ark-time          "0.8 SBU">
Index: kde/add/gwenview.xml
===================================================================
--- kde/add/gwenview.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/add/gwenview.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,6 +8,6 @@
   <!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     "25 MB">
+  <!ENTITY gwenview-size          "2.2 MB">
+  <!ENTITY gwenview-buildsize     "24 MB">
   <!ENTITY gwenview-time          "1.6 SBU">
 ]>
@@ -74,5 +74,7 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="kde-baseapps"/>, 
+    <xref linkend="kactivities"/>, 
+    <xref linkend="kde-baseapps"/>,
+    <xref linkend="nepomuk-core"/>,
     <xref linkend="libkexiv2"/> and
     <xref linkend="libjpeg"/>
@@ -81,4 +83,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="lcms2"/> and
       <ulink url="http://kde-apps.org/content/show.php/Kipi-Plugins?content=16061">
       Kipi-Plugins</ulink> (a collection of image manipulation plugins) 
Index: kde/add/kate.xml
===================================================================
--- kde/add/kate.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/add/kate.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -9,5 +9,5 @@
   <!ENTITY kate-md5sum        "6c2d931aa590547b259ddd71983dcf46">
   <!ENTITY kate-size          "2.1 MB">
-  <!ENTITY kate-buildsize     "80 MB">
+  <!ENTITY kate-buildsize     "75 MB">
   <!ENTITY kate-time          "4.6 SBU">
 ]>
@@ -74,4 +74,15 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="kactivities"/>
+    </para>
+    
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="http://qjson.sourceforge.net/">qjson</ulink> and
+      <ulink url="&kde-download-http;&kde-version;/src/">PyKDE4</ulink>
+    </para>
+    
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/kate"/>
@@ -90,4 +101,5 @@
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
       -DCMAKE_BUILD_TYPE=Release \
+      -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE \
       .. &amp;&amp;
 make</userinput></screen>
@@ -96,4 +108,12 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+  
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><option>-DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE</option>: This option is 
+    set to install the KDE Python objects in the correct place.</para>
 
   </sect2>
@@ -108,10 +128,9 @@
 
       <seglistitem>
-        <seg>kate, ktesnippets_editor and kwrite</seg>
+        <seg>kate and kwrite</seg>
         <seg>libkateinterfaces.so, libkatepartinterfaces.so,
-        libkdeinit4_kate.so, libkdeinit4_kwrite.so,
-        libktexteditor_codesnippets_core.so and several in &kde-dir;/lib/kde4
-        </seg>
-        <seg>several in &kde-dir;/include and &kde-dir;/share</seg>
+        libkdeinit4_kate.so, libkdeinit4_kwrite.so and several in 
+        &kde-dir;/lib/kde4</seg>
+        <seg>&kde-dir;/include/kate and several in &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>
Index: kde/add/kdeadmin.xml
===================================================================
--- kde/add/kdeadmin.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/add/kdeadmin.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,6 +8,6 @@
   <!ENTITY kdeadmin-download-ftp  "&kde-download-ftp;&kde-version;/src/kdeadmin-&kde-version;.tar.xz">
   <!ENTITY kdeadmin-md5sum        "fe6917aa5e03adca25b7ccbdbf2e0097">
-  <!ENTITY kdeadmin-size          "1.2 MB">
-  <!ENTITY kdeadmin-buildsize     "25 MB">
+  <!ENTITY kdeadmin-size          "665 KB">
+  <!ENTITY kdeadmin-buildsize     "23 MB">
   <!ENTITY kdeadmin-time          "2.2 SBU">
 ]>
Index: kde/add/kdepim-runtime.xml
===================================================================
--- kde/add/kdepim-runtime.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/add/kdepim-runtime.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,6 +8,6 @@
   <!ENTITY kdepim-runtime-download-ftp  "&kde-download-ftp;&kde-version;/src/kdepim-runtime-&kde-version;.tar.xz">
   <!ENTITY kdepim-runtime-md5sum        "9bfc13a1180f58024e9baa881c4d6743">
-  <!ENTITY kdepim-runtime-size          "1.2 MB">
-  <!ENTITY kdepim-runtime-buildsize     "90 MB">
+  <!ENTITY kdepim-runtime-size          "1.1 MB">
+  <!ENTITY kdepim-runtime-buildsize     "106 MB">
   <!ENTITY kdepim-runtime-time          "7.2 SBU">
 ]>
@@ -113,10 +113,11 @@
 
       <seglistitem>
-        <seg>accountwizard, akonadi2xml, akonadi_*_resource, akonaditray, 
-        kaddressbookmigrator, kjotsmigrator, kmail-migrator and kres-migrator
-        </seg>
-        <seg>libakonadi-filestore.so, libakonadi-xml.so, libkdepim-copy.so,
-        libkdepim-runtime-dms-copy.so, libkmindexreader.so, libmaildir.so,
-        libnepomukfeederpluginlib.a and several in &kde-dir;/lib/kde4</seg>
+        <seg>accountwizard, akonadi2xml, akonadi_nepomuk_feeder,
+        akonadi_*_agent, akonadi_*_resource, akonaditray, 
+        kaddressbookmigrator, kjotsmigrator, kmail-migrator, kres-migrator and
+        nepomukpimindexerutility</seg>
+        <seg>libakonadi-filestore.so, libakonadi-xml.so, libkdepim-copy.so, 
+        libkmindexreader.so, libmaildir.so, libnepomukfeederpluginlib.a and 
+        several in &kde-dir;/lib/kde4</seg>
         <seg>several in &kde-dir;/share</seg>
       </seglistitem>
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/add/kdepim.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,6 +8,6 @@
   <!ENTITY kdepim-download-ftp  "&kde-download-ftp;&kde-version;/src/kdepim-&kde-version;.tar.xz">
   <!ENTITY kdepim-md5sum        "0f4c057c76aec1fbf8c8934cacf49845">
-  <!ENTITY kdepim-size          "14 MB">
-  <!ENTITY kdepim-buildsize     "300 MB">
+  <!ENTITY kdepim-size          "15 MB">
+  <!ENTITY kdepim-buildsize     "318 MB">
   <!ENTITY kdepim-time          "19.2 SBU">
 ]>
@@ -77,4 +77,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+    <xref linkend="nepomuk-widgets"/>,
     <xref linkend="boost"/> and
     <xref linkend="libassuan"/>
@@ -97,6 +98,6 @@
     <title>Installation of Kdepim</title>
 
-<!-- This should be added in automoc4 instructions. I don't like that some package
-     modifies already installed one.
+   <!--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
@@ -106,12 +107,10 @@
 
 <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>Install <application>Kdepim</application> by running
     the following commands:</para>
 
-<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;
+<screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
@@ -137,5 +136,5 @@
       <seglistitem>
         <seg>akonadi_archivemail_agent, akonadi_mailfilter_agent,
-        akonadiconsole, akregator, akregatorstorageexporter, backupmail,
+        akonadiconsole, akregator, akregatorstorageexporter,
         blogilo, ical2vcal, importwizard, kabc2mutt, kabcclient,
         kaddressbook, kaddressbook-mobile, kalarm, kalarmautostart, karm,
@@ -144,5 +143,5 @@
         kmailcvt, knode, knotes, konsolekalendar, kontact, korgac, korganizer,
         korganizer-mobile, ksendemail, ktimetracker, ktnef, kwatchgnupg,
-        notes-mobile and tasks-mobile</seg>
+        notes-mobile, pimsettingexporter and tasks-mobile</seg>
 	<seg>several in &kde-dir;/lib</seg>
         <seg>several in &kde-dir;/share</seg>
Index: kde/add/kdeplasma-addons.xml
===================================================================
--- kde/add/kdeplasma-addons.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/add/kdeplasma-addons.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -9,5 +9,5 @@
   <!ENTITY kdeplasma-addons-md5sum        "50d05e54dbe395073f455f82245535cc">
   <!ENTITY kdeplasma-addons-size          "1.7 MB">
-  <!ENTITY kdeplasma-addons-buildsize     "8.5 MB">
+  <!ENTITY kdeplasma-addons-buildsize     "72 MB">
   <!ENTITY kdeplasma-addons-time          "5.1 SBU">
 ]>
Index: kde/add/kmix.xml
===================================================================
--- kde/add/kmix.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/add/kmix.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,5 +8,5 @@
   <!ENTITY kmix-download-ftp  "&kde-download-ftp;&kde-version;/src/kmix-&kde-version;.tar.xz">
   <!ENTITY kmix-md5sum        "3dcd75e3b2ff3a69ec200f4a5d60d24f">
-  <!ENTITY kmix-size          "300 KB">
+  <!ENTITY kmix-size          "380 KB">
   <!ENTITY kmix-buildsize     "15 MB">
   <!ENTITY kmix-time          "0.3 SBU">
Index: kde/add/konsole.xml
===================================================================
--- kde/add/konsole.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/add/konsole.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,6 +8,6 @@
   <!ENTITY konsole-download-ftp  "&kde-download-ftp;&kde-version;/src/konsole-&kde-version;.tar.xz">
   <!ENTITY konsole-md5sum        "2e1bea3c818df37bf0ef8129440c66e6">
-  <!ENTITY konsole-size          "436 KB">
-  <!ENTITY konsole-buildsize     "15 MB">
+  <!ENTITY konsole-size          "437 KB">
+  <!ENTITY konsole-buildsize     "12 MB">
   <!ENTITY konsole-time          "0.7 SBU">
 ]>
@@ -69,7 +69,12 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+    <xref linkend="kdelibs"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
     <xref linkend="kde-baseapps"/>
     </para>
-
+    
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/konsole"/>
Index: kde/add/libkcddb.xml
===================================================================
--- kde/add/libkcddb.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/add/libkcddb.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,5 +8,5 @@
   <!ENTITY libkcddb-download-ftp  "&kde-download-ftp;&kde-version;/src/libkcddb-&kde-version;.tar.xz">
   <!ENTITY libkcddb-md5sum        "b1e0760c6ff825629cc1500f203ee2aa">
-  <!ENTITY libkcddb-size          "156 KB">
+  <!ENTITY libkcddb-size          "157 KB">
   <!ENTITY libkcddb-buildsize     "5.5 MB">
   <!ENTITY libkcddb-time          "0.3 SBU">
Index: kde/add/libkexiv2.xml
===================================================================
--- kde/add/libkexiv2.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/add/libkexiv2.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,5 +8,5 @@
   <!ENTITY libkexiv2-download-ftp  "&kde-download-ftp;&kde-version;/src/libkexiv2-&kde-version;.tar.xz">
   <!ENTITY libkexiv2-md5sum        "079e048aba5fd76ea5ba39871fc61b19">
-  <!ENTITY libkexiv2-size          "132 KB">
+  <!ENTITY libkexiv2-size          "133 KB">
   <!ENTITY libkexiv2-buildsize     "6.5 MB">
   <!ENTITY libkexiv2-time          "0.4 SBU">
Index: kde/add/okular.xml
===================================================================
--- kde/add/okular.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/add/okular.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -9,5 +9,5 @@
   <!ENTITY okular-md5sum        "c95ada3fb597a6f3e727b4bbe92de087">
   <!ENTITY okular-size          "1.4 MB">
-  <!ENTITY okular-buildsize     "30 MB">
+  <!ENTITY okular-buildsize     "26 MB">
   <!ENTITY okular-time          "2.1 SBU">
 ]>
@@ -75,9 +75,10 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+    <xref linkend="kactivities"/>,
     <xref linkend="freetype2"/>, 
     <xref linkend="qimageblitz"/>, 
     <xref linkend="libtiff"/>, 
     <xref linkend="libjpeg"/> and
-    <xref linkend="poppler"/> (required for pdf support)
+    <xref linkend="poppler"/> (required for PDF support)
     </para>
     
@@ -88,4 +89,6 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <ulink url="https://projects.kde.org/projects/extragear/base/plasma-mobile">ActiveApp</ulink>
+      (for developing applications for Plasma Active),
       <ulink url="http://libspectre.freedesktop.org/">libspectre</ulink> (for PostScript support), 
       <ulink url="http://www.jedrea.com/chmlib">libchm</ulink>, 
@@ -131,6 +134,6 @@
         <seg>okular</seg>
 	<seg>libokularcore.so and several in &kde-dir;/lib/kde4</seg>
-	<seg>several in &kde-dir;/include, &kde-dir;/lib and &kde-dir;/share
-        </seg>
+        <seg>&kde-dir;/include/okular and several in &kde-dir;/lib and
+        &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>
Index: kde/core/core.xml
===================================================================
--- kde/core/core.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/core/core.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -29,4 +29,5 @@
   <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="nepomuk-widgets.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"/>
Index: kde/core/kactivities.xml
===================================================================
--- kde/core/kactivities.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/core/kactivities.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,6 +8,6 @@
   <!ENTITY kactivities-download-ftp  "&kde-download-ftp;&kde-version;/src/kactivities-&kde-version;.tar.xz">
   <!ENTITY kactivities-md5sum        "3fd44af91801291287ebd72ed6444744">
-  <!ENTITY kactivities-size          "88 KB">
-  <!ENTITY kactivities-buildsize     "8.6 MB">
+  <!ENTITY kactivities-size          "102 KB">
+  <!ENTITY kactivities-buildsize     "11.4 MB">
   <!ENTITY kactivities-time          "0.5 SBU">
 ]>
@@ -71,4 +71,9 @@
     <xref linkend="kdelibs"/> 
     </para>
+    
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+    <xref linkend="nepomuk-core"/> 
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -108,6 +113,9 @@
       <seglistitem>
         <seg>kactivitymanagerd</seg>
-        <seg>libkactivities.so and several in &kde-dir;/lib/kde4</seg>
-        <seg>&kde-dir;/include/kactivities, &kde-dir;/include/KDE/KActivities
+        <seg>libkactivities.so, libkactivities-models.so and several in
+        &kde-dir;/lib/kde4</seg>
+        <seg>&kde-dir;/include/kactivities,
+        &kde-dir;/include/kactivities-models, &kde-dir;/include/KDE/KActivities,
+        &kde-dir;/lib/cmake/KActivities, &kde-dir;/lib/cmake/KActivities-models,
         and several in &kde-dir;/share</seg>
       </seglistitem>
Index: kde/core/kde-base-artwork.xml
===================================================================
--- kde/core/kde-base-artwork.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/core/kde-base-artwork.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -9,5 +9,5 @@
   <!ENTITY kde-base-artwork-md5sum        "99f74baa84816fd5f757317f22e423a1">
   <!ENTITY kde-base-artwork-size          "16 MB">
-  <!ENTITY kde-base-artwork-buildsize     "35 MB">
+  <!ENTITY kde-base-artwork-buildsize     "7.4 MB">
   <!ENTITY kde-base-artwork-time          "less than 0.1 SBU">
 ]>
Index: kde/core/kde-baseapps.xml
===================================================================
--- kde/core/kde-baseapps.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/core/kde-baseapps.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -9,5 +9,5 @@
   <!ENTITY kde-baseapps-md5sum        "510440a4efc787e3fbb7d13e24ce821c">
   <!ENTITY kde-baseapps-size          "2.5 MB">
-  <!ENTITY kde-baseapps-buildsize     "85 MB">
+  <!ENTITY kde-baseapps-buildsize     "82 MB">
   <!ENTITY kde-baseapps-time          "5.2 SBU">
 ]>
@@ -58,13 +58,4 @@
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kde-baseapps-&kdelibs-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
     <bridgehead renderas="sect3">Kde-baseapps Dependencies</bridgehead>
 
@@ -72,4 +63,10 @@
     <para role="required">
     <xref linkend="kdelibs"/>
+    </para>
+    
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+    <xref linkend="kactivities"/> and
+    <xref linkend="nepomuk-widgets"/>
     </para>
 
Index: kde/core/kde-runtime.xml
===================================================================
--- kde/core/kde-runtime.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/core/kde-runtime.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,6 +8,6 @@
   <!ENTITY kde-runtime-download-ftp  "&kde-download-ftp;&kde-version;/src/kde-runtime-&kde-version;.tar.xz">
   <!ENTITY kde-runtime-md5sum        "e7b17cb6f59d8c36a09ac9862936fd44">
-  <!ENTITY kde-runtime-size          "6.2 MB">
-  <!ENTITY kde-runtime-buildsize     "125 MB">
+  <!ENTITY kde-runtime-size          "7.1 MB">
+  <!ENTITY kde-runtime-buildsize     "111 MB">
   <!ENTITY kde-runtime-time          "7.5 SBU">
 ]>
@@ -69,5 +69,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kactivities"/> and
+    <xref linkend="kdelibs"/> and
     <xref linkend="libtirpc"/>
     </para>
@@ -75,5 +75,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="nepomuk-core"/>,
+    <xref linkend="kactivities"/>,
+    <xref linkend="kdepimlibs"/>
     <xref linkend="alsa-lib"/>,
     <xref linkend="libjpeg"/> and 
@@ -132,5 +133,5 @@
 
       <seglistitem>
-        <seg>kcmshell4, kde-cp, kde-mv, kde-open, kdesu, kde4, kde4-menu,
+        <seg>kcmshell4, kde-cp, kde-mv, kde-open, kde4, kde4-menu,
         kdebugdialog, keditfiletype, kfile4, kglobalaccel, khelpcenter,
         khotnewstuff-upload, khotnewstuff4, kiconfinder, kioclient,
@@ -144,21 +145,4 @@
     </segmentedlist>
 
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="kdesu">
-        <term><command>kdesu</command></term>
-        <listitem>
-          <para>Runs a program with elevated privileges.</para>
-          <indexterm zone="kde-runtime kdesu">
-            <primary sortas="b-kdesu">kdesu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
   </sect2>
 
Index: kde/core/kde-workspace.xml
===================================================================
--- kde/core/kde-workspace.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/core/kde-workspace.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,6 +8,6 @@
   <!ENTITY kde-workspace-download-ftp  "&kde-download-ftp;&kde-version;/src/kde-workspace-&kde-version;.tar.xz">
   <!ENTITY kde-workspace-md5sum        "139bdce88559ddc638ea616a6a443cf6">
-  <!ENTITY kde-workspace-size          "22 MB">
-  <!ENTITY kde-workspace-buildsize     "375 MB">
+  <!ENTITY kde-workspace-size          "13.4 MB">
+  <!ENTITY kde-workspace-buildsize     "333 MB">
   <!ENTITY kde-workspace-time          "20 SBU">
 ]>
@@ -72,11 +72,14 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kactivities"/> and
-    <xref linkend="qimageblitz"/>
+    <xref linkend="kactivities"/>,
+    <xref linkend="qimageblitz"/>,
+    <xref linkend="xcb-util-image"/> and
+    <xref linkend="xcb-util-renderutil"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="kdepimlibs"/>, 
+    <xref linkend="kdepimlibs"/>,
+    <xref linkend="nepomuk-core"/>,
     <xref linkend="boost"/>, 
     <xref linkend="freetype2"/>, 
@@ -96,8 +99,14 @@
     <ulink url="https://ieee1394.wiki.kernel.org/index.html">libraw1394</ulink>, 
     <ulink url="http://www.catb.org/gpsd/">gpsd</ulink>, 
-    <ulink url="http://www.xmms.org/">XMMS</ulink> and
-    <ulink url="http://qalculate.sourceforge.net/">Qalculate!</ulink>
-    </para>
-
+    <ulink url="http://www.xmms.org/">XMMS</ulink>,
+    <ulink url="http://qalculate.sourceforge.net/">Qalculate!</ulink> and
+    <ulink url="http://qjson.sourceforge.net/">qjson</ulink>
+    </para>
+
+    <note><para>Kde-workspace has a run-time dependency called appmenu-qt,
+    which allows the application menubar to be inserted as a single button in
+    the titlebar. It can be found 
+    <ulink url="https://launchpad.net/appmenu-qt">here</ulink>.</para></note>
+   
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/kde-workspace"/>
@@ -129,5 +138,5 @@
       -DSYSCONF_INSTALL_DIR=/etc \
       -DCMAKE_BUILD_TYPE=Release \
-      -DPYTHON_SITE_PACKAGES_INSTALL_DIR=/usr/lib/python2.7/site-packages \
+      -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE \
       .. &amp;&amp;
 make</userinput></screen>
@@ -145,5 +154,5 @@
     <title>Command Explanations</title>
 
-    <para><option>-DPYTHON_SITE_PACKAGES_INSTALL...</option>: This option is 
+    <para><option>-DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE</option>: This option is 
     set to install the KDE Python objects in the correct place.</para>
 
@@ -218,8 +227,7 @@
         kmenuedit, krandom.kss, krandrstartup, krandrtray, krdb, krunner,
         ksmserver, ksplashqml, ksplashsimple, ksplashx, ksplashx_scale,
-        kstartupconfig4, ksysguard, ksysguardd, ksystraycmd, kwin, kwrited,
-        oxygen-demo, oxygen-settings, oxygen-shadow-demo, plasma-desktop,
-        plasma-netbook, plasma-overlay, plasma-windowed, plasmaengineexplorer,
-        plasmawallpaperviewer, plasmoidviewer, remote-widgets-browser,
+        kstartupconfig4, ksysguard, ksysguardd, ksystraycmd, kwin, kwin_gles,
+        kwrited, oxygen-demo, oxygen-settings, oxygen-shadow-demo,
+        plasma-desktop, plasma-netbook, plasma-overlay, plasma-windowed,
         solid-action-desktop-gen, solid-network, startkde and systemsettings
         </seg>
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/core/kdelibs.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,6 +8,6 @@
   <!ENTITY kdelibs-download-ftp  "&kde-download-ftp;&kde-version;/src/kdelibs-&kde-version;.tar.xz">
   <!ENTITY kdelibs-md5sum        "2155d7ae075a1c7e9c6398b381c67177">
-  <!ENTITY kdelibs-size          "12 MB">
-  <!ENTITY kdelibs-buildsize     "390 MB">
+  <!ENTITY kdelibs-size          "11.8 MB">
+  <!ENTITY kdelibs-buildsize     "370 MB">
   <!ENTITY kdelibs-time          "24 SBU">
 ]>
@@ -105,6 +105,7 @@
     <ulink url="http://oss.sgi.com/projects/fam/">FAM</ulink>, 
     <ulink url="http://www.herqq.org/">HUPnP</ulink>, 
-    <xref linkend="mitkrb"/> and
-    <ulink url="http://www.openexr.com/">OpenEXR</ulink>    
+    <xref linkend="mitkrb"/>,
+    <ulink url="http://www.openexr.com/">OpenEXR</ulink> and
+    <ulink url="http://www.freedesktop.org/wiki/Software/media-player-info">media-player-info</ulink>
     </para>
 
@@ -170,7 +171,7 @@
         <seg>checkXML, kbuildsycoca4, kconfig_compiler, kcookiejar4,
         kde4-config, kded4, kdeinit4, kdeinit4_shutdown, kdeinit4_wrapper,
-        kfilemetadatareader, kjs, kjscmd, kross, kshell4, kunittestmodrunner,
-        kwrapper4, makekdewidgets, meinproc4, meinproc4_simple, nepomuk-rcgen
-        and preparetips</seg>
+        kfilemetadatareader, kjs, kjscmd, kmailservice, kross, kshell4, 
+        ktelnetservice, kunittestmodrunner, kwrapper4, makekdewidgets,
+        meinproc4, meinproc4_simple, nepomuk-rcgen and preparetips</seg>
         <seg>several in &kde-dir;/lib</seg>
         <seg>several in &kde-dir;/include, &kde-dir;/lib and &kde-dir;/share
Index: kde/core/kdepimlibs.xml
===================================================================
--- kde/core/kdepimlibs.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/core/kdepimlibs.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,6 +8,6 @@
   <!ENTITY kdepimlibs-download-ftp  "&kde-download-ftp;&kde-version;/src/kdepimlibs-&kde-version;.tar.xz">
   <!ENTITY kdepimlibs-md5sum        "0ee906b58e3a8e8acd6f03482ea8a9bb">
-  <!ENTITY kdepimlibs-size          "2.6 MB">
-  <!ENTITY kdepimlibs-buildsize     "135 MB">
+  <!ENTITY kdepimlibs-size          "2.7 MB">
+  <!ENTITY kdepimlibs-buildsize     "153 MB">
   <!ENTITY kdepimlibs-time          "7.5 SBU">
 ]>
@@ -70,21 +70,17 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdelibs"/>, 
+    <xref linkend="nepomuk-core"/>,
     <xref linkend="libxslt"/>, 
     <xref linkend="gpgme"/>, 
     <xref linkend="libical"/>,
-    <xref linkend="akonadi"/> and
-    <xref linkend="cyrus-sasl"/>
+    <xref linkend="akonadi"/>,
+    <xref linkend="cyrus-sasl"/> and
+    <xref linkend="boost"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="boost"/> and
-    <xref linkend="openldap"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <ulink url="ftp://ftp.kde.org/pub/kde/stable/prison/1.0/src/">Prison</ulink>
+    <xref linkend="openldap"/> and
+    <ulink url="http://qjson.sourceforge.net/">qjson</ulink>
     </para>
 
@@ -124,5 +120,5 @@
 
       <seglistitem>
-        <seg>none</seg>
+        <seg>akonadi_benchmarker and akonaditest</seg>
         <seg>several in &kde-dir;/lib</seg>
         <seg>several in &kde-dir;/include, &kde-dir;/lib and &kde-dir;/share
Index: kde/core/nepomuk-core.xml
===================================================================
--- kde/core/nepomuk-core.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/core/nepomuk-core.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,6 +8,6 @@
   <!ENTITY nepomuk-core-download-ftp  "&kde-download-ftp;&kde-version;/src/nepomuk-core-&kde-version;.tar.xz">
   <!ENTITY nepomuk-core-md5sum        "0182ca4735278484c9b78ec5ecf0b825">
-  <!ENTITY nepomuk-core-size          "384 KB">
-  <!ENTITY nepomuk-core-buildsize     "35 MB">
+  <!ENTITY nepomuk-core-size          "357 KB">
+  <!ENTITY nepomuk-core-buildsize     "37 MB">
   <!ENTITY nepomuk-core-time          "0.3 SBU">
 ]>
@@ -75,4 +75,12 @@
     <xref linkend="kdelibs"/>
     </para>
+    
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+    <xref linkend="poppler"/>,
+    <xref linkend="taglib"/>,
+    <xref linkend="exiv2"/> and
+    <xref linkend="ffmpeg"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -111,11 +119,13 @@
 
       <seglistitem>
-        <seg>nepomuk-simplesource-rcgen, nepomukbackup, nepomukindexer,
-        nepomukserver and nepomukservicestub</seg>
+        <seg>nepomuk-simplesource-rcgen, nepomuk2-rcgen, nepomukbackup,
+        nepomukcleaner, nepomukindexer, nepomukserver and
+        nepomukservicestub</seg>
         <seg>libkdeinit4_nepomukserver.so, libnepomukcommon.so,
-        libnepomukcore.so, libnepomuksync.so and several in
+        libnepomukcore.so and several in
         &kde-dir;/lib/kde4</seg>
         <seg>&kde-dir;/include/nepomuk2, &kde-dir;/include/Nepomuk2,
-        &kde-dir;/lib/cmake/NepomukCore and several in &kde-dir;/share/apps</seg>
+        &kde-dir;/lib/cmake/NepomukCore and several in
+        &kde-dir;/share/apps</seg>
       </seglistitem>
     </segmentedlist>
Index: kde/core/nepomuk-widgets.xml
===================================================================
--- kde/core/nepomuk-widgets.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
+++ kde/core/nepomuk-widgets.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -0,0 +1,120 @@
+<?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 nepomuk-widgets-download-http "&kde-download-http;&kde-version;/src/nepomuk-widgets-&kde-version;.tar.xz">
+  <!ENTITY nepomuk-widgets-download-ftp  "&kde-download-ftp;&kde-version;/src/nepomuk-widgets-&kde-version;.tar.xz">
+  <!ENTITY nepomuk-widgets-md5sum        "0182ca4735278484c9b78ec5ecf0b825">
+  <!ENTITY nepomuk-widgets-size          "78 KB">
+  <!ENTITY nepomuk-widgets-buildsize     "4.8 MB">
+  <!ENTITY nepomuk-widgets-time          "0.1 SBU">
+]>
+
+<sect1 id="nepomuk-widgets" xreflabel="nepomuk-widgets-&kde-version;">
+  <?dbhtml filename="nepomuk-widgets.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Nepomuk-widgets-&kde-version;</title>
+
+  <indexterm zone="nepomuk-widgets">
+    <primary sortas="a-nepomuk-widgets">nepomuk-widgets</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to nepomuk-widgets</title>
+
+    <para>Nepomuk-widgets contains the widget library for the Nepomuk Semantik
+    Desktop.</para>
+
+    &lfs72_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&nepomuk-widgets-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&nepomuk-widgets-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &nepomuk-widgets-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &nepomuk-widgets-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &nepomuk-widgets-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &nepomuk-widgets-time;</para>
+      </listitem>
+    </itemizedlist>
+
+<!--
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/nepomuk-widgets-&kde-version;-rpc_fix-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+ -->
+ 
+    <bridgehead renderas="sect3">Nepomuk-widgets Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+    <xref linkend="nepomuk-core"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/nepomuk-widgets"/>
+    </para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of nepomuk-widgets</title>
+
+    <para>Install <application>nepomuk-widgets</application> by running the following
+    commands:</para>
+
+<!-- Nothing is installed in sysconfdir ... -->
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release \
+      .. &amp;&amp;
+make</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 Directories</segtitle>
+
+      <seglistitem>
+        <seg>none</seg>
+        <seg>libnepomukwidgets.so</seg>
+        <seg>&kde-dir;/include/nepomuk2 and
+        &kde-dir;/lib/cmake/NepomukWidgets</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: kde/core/oxygen-icons.xml
===================================================================
--- kde/core/oxygen-icons.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ kde/core/oxygen-icons.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -8,6 +8,6 @@
   <!ENTITY oxygen-icons-download-ftp  "&kde-download-ftp;&kde-version;/src/oxygen-icons-&kde-version;.tar.xz">
   <!ENTITY oxygen-icons-md5sum        "abb39b10509272a8e7e658f2d5a4e0d3">
-  <!ENTITY oxygen-icons-size          "277 MB">
-  <!ENTITY oxygen-icons-buildsize     "470 MB">
+  <!ENTITY oxygen-icons-size          "278 MB">
+  <!ENTITY oxygen-icons-buildsize     "431 MB">
   <!ENTITY oxygen-icons-time          "less than 0.1 SBU">
 ]>
Index: x/installing/xcb-util-image.xml
===================================================================
--- x/installing/xcb-util-image.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ x/installing/xcb-util-image.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -91,6 +91,5 @@
     </para>
 
-<screen><userinput>./configure $XORG_CONFIG \
-            --disable-static &amp;&amp;
+<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
@@ -104,12 +103,4 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>    
 
   </sect2>
Index: x/installing/xcb-util-renderutil.xml
===================================================================
--- x/installing/xcb-util-renderutil.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ x/installing/xcb-util-renderutil.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -91,6 +91,5 @@
     </para>
 
-<screen><userinput>./configure $XORG_CONFIG \
-            --disable-static &amp;&amp;
+<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
@@ -104,12 +103,4 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>    
 
   </sect2>
Index: x/installing/xcb-util.xml
===================================================================
--- x/installing/xcb-util.xml	(revision a78e0c420b5337754d1f1cfe18ad189d7685b44b)
+++ x/installing/xcb-util.xml	(revision cd6d4551a9bf590153e19b4b4c2bdc548bfa7da7)
@@ -94,6 +94,5 @@
     </para>
 
-<screen><userinput>./configure $XORG_CONFIG \
-            --disable-static &amp;&amp;
+<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
 make</userinput></screen>
 
@@ -107,12 +106,4 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/static-libraries.xml"/>    
 
   </sect2>
