Index: general.ent
===================================================================
--- general.ent	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ general.ent	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "12">                   <!-- Always 2 digits -->
+<!ENTITY day          "14">                   <!-- Always 2 digits -->
 <!ENTITY month        "07">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "July 12th, &year;">
+<!ENTITY releasedate  "July 14th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
@@ -701,9 +701,9 @@
 <!ENTITY kde-download-http           "http://mirrors.isc.org/pub/kde/stable/">
 <!ENTITY kde-download-ftp            "ftp://ftp.kde.org/pub/kde/stable/">
-<!ENTITY kde-dir-var                 "KDE4_PREFIX">
+<!ENTITY kde-dir-var                 "KDE_PREFIX">
 <!ENTITY kde-dir                     "$&kde-dir-var;">
 <!ENTITY automoc4-version             "0.9.88">
 <!ENTITY phonon-version               "4.6.0">
-<!ENTITY phonon-backend-gstreamer-version "4.6.0">
+<!ENTITY phonon-backend-gstreamer-version "4.6.1">
 <!ENTITY phonon-backend-vlc-version   "0.5.0">
 <!ENTITY attica-version               "0.4.0">
Index: general/genutils/desktop-file-utils.xml
===================================================================
--- general/genutils/desktop-file-utils.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ general/genutils/desktop-file-utils.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -131,5 +131,5 @@
       <para>For <application>KDE</application>:</para>
 
-<screen><literal>XDG_DATA_DIRS=$KDE_PREFIX/share:/usr/local/share:/usr/share
+<screen><literal>XDG_DATA_DIRS=&kde-dir;/share:/usr/local/share:/usr/share
 XDG_CONFIG_DIRS=/etc/kde/xdg:/etc/xdg
 export XDG_DATA_DIRS XDG_CONFIG_DIRS</literal></screen>
@@ -145,5 +145,5 @@
       <application>KDE</application>:</para>
 
-<screen><literal>XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME_PREFIX/share:$KDE_PREFIX/share
+<screen><literal>XDG_DATA_DIRS=$XDG_DATA_DIRS:$GNOME_PREFIX/share:&kde-dir;/share
 export XDG_DATA_DIRS</literal></screen>
 
Index: general/prog/subversion.xml
===================================================================
--- general/prog/subversion.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ general/prog/subversion.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -103,5 +103,5 @@
       <xref linkend="dbus-glib"/>,
       <xref linkend="gnome-keyring"/>,
-      KWallet from KDE4 and
+      KWallet from KDE and
       <xref linkend="apache"/>.
     </para>
Index: gnome/deprecated/libgnomeui.xml
===================================================================
--- gnome/deprecated/libgnomeui.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ gnome/deprecated/libgnomeui.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -114,5 +114,5 @@
     <!-- seems bogus, no kde dependencies. dashes changed to plus to keep it
     as a valid comment
-   <para><option>++with-kde-datadir=$KDE_PREFIX/share</option>: Use this
+   <para><option>++with-kde-datadir=&kde-dir;/share</option>: Use this
     parameter if you have <application>KDE</application> installed in any prefix
     other than <filename class='directory'>/usr</filename>.</para>-->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ introduction/welcome/changelog.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -43,4 +43,25 @@
 -->
     <listitem>
+      <para>July 14th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[rthomsen] - Changed the KDE system configuration file 
+          installation directory from /etc/kde4 to /etc/kde.</para>
+        </listitem>
+        <listitem>
+          <para>[rthomsen] - Removed the cmake option 
+          -DKDE_DEFAULT_HOME=.kde4 from KDE packages.</para>
+        </listitem>
+        <listitem>
+          <para>[rthomsen] - Use $KDE_PREFIX instead of $KDE4_PREFIX.</para>
+        </listitem>
+        <listitem>
+          <para>[rthomsen] - Phonon-backend-gstreamer 4.6.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+
+    <listitem>
       <para>July 12th, 2012</para>
       <itemizedlist>
Index: kde4/add/add-pkgs.xml
===================================================================
--- kde4/add/add-pkgs.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/add/add-pkgs.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -49,7 +49,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
Index: kde4/add/ark.xml
===================================================================
--- kde4/add/ark.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/add/ark.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -96,7 +96,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
Index: kde4/add/gwenview.xml
===================================================================
--- kde4/add/gwenview.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/add/gwenview.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -99,7 +99,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
@@ -129,5 +128,5 @@
         <seg>gwenview and gwenview_importer</seg>
 	<seg>libgwenviewlib.so and gvpart.so</seg>
-	<seg>several in $KDE4_PREFIX/share</seg>
+	<seg>several in &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>
Index: kde4/add/kate.xml
===================================================================
--- kde4/add/kate.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/add/kate.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -96,7 +96,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
Index: kde4/add/kcalc.xml
===================================================================
--- kde4/add/kcalc.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/add/kcalc.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -94,7 +94,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
@@ -124,5 +123,5 @@
         <seg>kcalc</seg>
         <seg>libkdeinit4_kcalc.so</seg>
-	<seg>several in $KDE4_PREFIX/share</seg>
+	<seg>several in &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>
Index: kde4/add/kde4admin.xml
===================================================================
--- kde4/add/kde4admin.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/add/kde4admin.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -101,6 +101,5 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
Index: kde4/add/kde4artwork.xml
===================================================================
--- kde4/add/kde4artwork.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/add/kde4artwork.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -79,5 +79,5 @@
     <para role="optional">
     <xref linkend="libkexiv2"/>, 
-    <xref linkend="xscreensaver"/> (to use the xscreensavers in KDE4) and
+    <xref linkend="xscreensaver"/> (to use the xscreensavers in KDE) and
     <ulink url="http://eigen.tuxfamily.org/">Eigen</ulink> (to build the krotation and kpendulum screensavers)
     </para>
@@ -97,7 +97,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
@@ -129,6 +128,6 @@
         klorenz.kss, kpartsaver.kss, kpendulum.kss, kpolygon.kss, krotation.kss,
         kscience.kss, kslideshow.kss, ksolarwinds.kss, kvm.kss and kwave.kss</seg>
-	<seg>several in $KDE4_PREFIX/lib/kde4</seg>
-        <seg>several in $KDE4_PREFIX/share</seg>
+	<seg>several in &kde-dir;/lib/kde4</seg>
+        <seg>several in &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>
Index: kde4/add/kde4multimedia.xml
===================================================================
--- kde4/add/kde4multimedia.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/add/kde4multimedia.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -103,7 +103,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
@@ -134,5 +133,5 @@
         <seg>libaudiocdplugins.so, libkcddb.so, libkcompactdisc.so
         libkdeinit4_kmixctrl.so, libkdeinit4_kmix.so</seg>
-        <seg>several in /etc/kde4, $KDE4_PREFIX/include and $KDE4_PREFIX/share</seg>
+        <seg>several in /etc/kde, &kde-dir;/include and &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>
Index: kde4/add/kde4network.xml
===================================================================
--- kde4/add/kde4network.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/add/kde4network.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -6,5 +6,5 @@
 
   <!ENTITY kdenetwork-download-http "&kde-download-http;&kdenetwork-version;/src/kdenetwork-&kdenetwork-version;.tar.xz">
-  <!ENTITY kdenetwork-download-ftp  "&kde-download-http;&kdenetwork-version;/src/kdenetwork-&kdenetwork-version;.tar.xz"> 
+  <!ENTITY kdenetwork-download-ftp  "&kde-download-ftp;&kdenetwork-version;/src/kdenetwork-&kdenetwork-version;.tar.xz"> 
   <!ENTITY kdenetwork-md5sum        "f6749a63de31ed16725bb71bd0eafaca">
   <!ENTITY kdenetwork-size          "8.5 MB">
@@ -118,7 +118,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
@@ -151,6 +150,6 @@
         <seg>libkgetcore.so, libkopete*.so, libkyahoo.so, liboscar.so, 
 	libkrdccore.so, libkrfbprivate.so, libqgroupwise.so and several 
-	in $KDE4_PREFIX/lib/kde4</seg>
-        <seg>several in $KDE4_PREFIX/include and $KDE4_PREFIX/share</seg>
+	in &kde-dir;/lib/kde4</seg>
+        <seg>several in &kde-dir;/include and &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>
Index: kde4/add/kde4pim.xml
===================================================================
--- kde4/add/kde4pim.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/add/kde4pim.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -103,7 +103,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
@@ -137,5 +136,5 @@
         knode, knotes, konsolekalendar, kontact, korgac, korganizer, korganizer-mobile, ksendemail,
         ktimetracker, kwatchgnupg, notes-mobile and tasks-mobile</seg>
-	<seg>numerous in $KDE4_PREFIX/lib</seg>
+	<seg>numerous in &kde-dir;/lib</seg>
         <seg></seg>
       </seglistitem>
Index: kde4/add/kde4pimruntime.xml
===================================================================
--- kde4/add/kde4pimruntime.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/add/kde4pimruntime.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -95,7 +95,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
Index: kde4/add/kde4plasmaaddons.xml
===================================================================
--- kde4/add/kde4plasmaaddons.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/add/kde4plasmaaddons.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -99,7 +99,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
@@ -130,5 +129,5 @@
         <seg>liblancelot-datamodels.so, liblancelot.so, libplasma_groupingcontainment.so, 
 	libplasmacomicprovidercore.so, libplasmapotdprovidercore.so, libplasmaweather.so, 
-	librtm.so and several in $KDE4_PREFIX/lib/kde4</seg>
+	librtm.so and several in &kde-dir;/lib/kde4</seg>
         <seg>...</seg>
       </seglistitem>
Index: kde4/add/konsole.xml
===================================================================
--- kde4/add/konsole.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/add/konsole.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -94,7 +94,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
Index: kde4/add/libkexiv2.xml
===================================================================
--- kde4/add/libkexiv2.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/add/libkexiv2.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -96,7 +96,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
Index: kde4/add/okular.xml
===================================================================
--- kde4/add/okular.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/add/okular.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -110,6 +110,5 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
Index: kde4/core/config.xml
===================================================================
--- kde4/core/config.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/core/config.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -51,5 +51,5 @@
     the path to kdm according to your system):</para>
     
-<screen><userinput>kd:5:respawn:/opt/kde4/bin/kdm</userinput></screen>
+<screen><userinput>kd:5:respawn:&kde-dir;/bin/kdm</userinput></screen>
 
     <para>Additionally, you need to change the default run-level from 3 to 5. This 
Index: kde4/core/kactivities.xml
===================================================================
--- kde4/core/kactivities.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/core/kactivities.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -94,7 +94,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
@@ -124,5 +123,5 @@
         <seg>kactivitymanagerd</seg>
         <seg>libactivities.so and activitymanager_plugin_*.so</seg>
-	<seg>$KDE4_PREFIX/include/kactivities and $KDE4_PREFIX/include/KDE/KActivities</seg>
+	<seg>&kde-dir;/include/kactivities and &kde-dir;/include/KDE/KActivities</seg>
       </seglistitem>
     </segmentedlist>
Index: kde4/core/kde4baseapps.xml
===================================================================
--- kde4/core/kde4baseapps.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/core/kde4baseapps.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -99,7 +99,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
@@ -132,5 +131,5 @@
         <seg>libkonq.so, libdolphinprivate.so, libkbookmarkmodel_private.so, 
 	libkdeinit4_keditbookmarks.so, libkonquerorprivate.so, libkonqsidebarplugin.so, 
-	libkdeinit4_dolphin.so and several in $KDE4_PREFIX/lib/kde4</seg>
+	libkdeinit4_dolphin.so and several in &kde-dir;/lib/kde4</seg>
         <seg>...</seg>
       </seglistitem>
Index: kde4/core/kde4libs.xml
===================================================================
--- kde4/core/kde4libs.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/core/kde4libs.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -6,5 +6,5 @@
 
   <!ENTITY kdelibs-download-http "&kde-download-http;&kdelibs-version;/src/kdelibs-&kdelibs-version;.tar.xz">
-  <!ENTITY kdelibs-download-ftp  "&kde-download-http;&kdelibs-version;/src/kdelibs-&kdelibs-version;.tar.xz">
+  <!ENTITY kdelibs-download-ftp  "&kde-download-ftp;&kdelibs-version;/src/kdelibs-&kdelibs-version;.tar.xz">
   <!ENTITY kdelibs-md5sum        "c4987c838164bd9ee2787e77243fe4a9">
   <!ENTITY kdelibs-size          "11.4 MB">
@@ -125,7 +125,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$&kde-dir-var; \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       -DDOCBOOKXML_CURRENTDTD_DIR=/usr/share/xml/docbook/xml-dtd-&DocBook-version; \
       .. &amp;&amp;
@@ -141,7 +140,5 @@
     <title>Command Explanations</title>
 
-    <para><option>-DKDE_DEFAULT_HOME=.kde4</option>: This option is set to
-    avoid clashes with a KDE3 installation on the same machine.</para>
-    <para><option>-DSYSCONF_INSTALL_DIR=/etc/kde4</option>: This option is set to
+    <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
@@ -165,5 +162,5 @@
         meinproc_simple, nepomuk-rcgen and preparetips</seg>
         <seg>several in &kde-dir;/lib</seg>
-	<seg>several in /etc/kde4, &kde-dir;/include and &kde-dir;/share</seg>
+	<seg>several in /etc/kde, &kde-dir;/include and &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>
Index: kde4/core/kde4pimlibs.xml
===================================================================
--- kde4/core/kde4pimlibs.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/core/kde4pimlibs.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -103,7 +103,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
@@ -132,6 +131,6 @@
       <seglistitem>
         <seg>none</seg>
-	<seg>several in $KDE4_PREFIX/lib</seg>
-        <seg>several in $KDE4_PREFIX/include</seg>
+	<seg>several in &kde-dir;/lib</seg>
+        <seg>several in &kde-dir;/include</seg>
       </seglistitem>
     </segmentedlist>
Index: kde4/core/kde4runtime.xml
===================================================================
--- kde4/core/kde4runtime.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/core/kde4runtime.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -108,6 +108,5 @@
 cd build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
@@ -144,5 +143,5 @@
 	plasma-remote-helper and solid-hardware</seg>
         <seg>several in &kde-dir;/lib</seg>
-        <seg>several in /etc/kde4, &kde-dir;/include and &kde-dir;/share</seg>
+        <seg>several in /etc/kde, &kde-dir;/include and &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>
Index: kde4/core/kde4workspace.xml
===================================================================
--- kde4/core/kde4workspace.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/core/kde4workspace.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -32,5 +32,5 @@
     <para>The Kde-workspace package contains components that are central to 
     providing the <application>KDE</application> desktop environment. Of 
-    particular importance are KWin, the <application>KDE4</application>
+    particular importance are KWin, the <application>KDE</application>
     window manager, and Plasma, which provides the workspace interface.</para>
 
@@ -72,6 +72,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdelibs"/> and 
-    <xref linkend="kactivities"/>  
+    <xref linkend="kdelibs"/>, 
+    <xref linkend="kactivities"/> and
+    <xref linkend="qimageblitz"/>
     </para>
 
@@ -114,7 +115,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       -DPYTHON_SITE_PACKAGES_INSTALL_DIR=/usr/lib/python2.7/site-packages \
       .. &amp;&amp;
@@ -131,5 +131,5 @@
 
     <para><option>-DPYTHON_SITE_PACKAGES_INSTALL...</option>: This option is 
-    set to install the KDE4 Python objects in the correct place.</para>
+    set to install the KDE Python objects in the correct place.</para>
 
   </sect2>
@@ -152,6 +152,6 @@
 	plasmawallpaperviewer, plasma-windowed, plasmoidviewer, solid-network, 
 	solid-action-desktop-gen, startkde and systemsettings</seg>
-        <seg>several in $KDE4_PREFIX/lib</seg>
-        <seg>several in /etc/kde4, $KDE4_PREFIX/include and $KDE4_PREFIX/share</seg>
+        <seg>several in &kde-dir;/lib</seg>
+        <seg>several in /etc/kde, &kde-dir;/include and &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>
Index: kde4/core/oxygen-icons.xml
===================================================================
--- kde4/core/oxygen-icons.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/core/oxygen-icons.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -115,5 +115,5 @@
         <seg>none</seg>
         <seg>none</seg>
-        <seg>$KDE4_PREFIX/share/icons/oxygen</seg>
+        <seg>&kde-dir;/share/icons/oxygen</seg>
       </seglistitem>
     </segmentedlist>
Index: kde4/core/phonon-backend-gstreamer.xml
===================================================================
--- kde4/core/phonon-backend-gstreamer.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/core/phonon-backend-gstreamer.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -7,7 +7,7 @@
   <!ENTITY phonon-backend-gstreamer-download-http "http://mirrors.isc.org/pub/kde/stable/phonon/phonon-backend-gstreamer/&phonon-backend-gstreamer-version;/src/phonon-backend-gstreamer-&phonon-backend-gstreamer-version;.tar.xz">
   <!ENTITY phonon-backend-gstreamer-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/phonon/phonon-backend-gstreamer/&phonon-backend-gstreamer-version;/src/phonon-backend-gstreamer-&phonon-backend-gstreamer-version;.tar.xz">
-  <!ENTITY phonon-backend-gstreamer-md5sum        "cc380c7612aaaa87294185ded702f88a">
+  <!ENTITY phonon-backend-gstreamer-md5sum        "c0c8a1064e32c83dd6976187dcc491a3">
   <!ENTITY phonon-backend-gstreamer-size          "70 KB">
-  <!ENTITY phonon-backend-gstreamer-buildsize     "3.1 MB">
+  <!ENTITY phonon-backend-gstreamer-buildsize     "4.0 MB">
   <!ENTITY phonon-backend-gstreamer-time          "0.3 SBU">
 ]>
@@ -33,5 +33,5 @@
     utilizes the <application>GStreamer</application> media framework.</para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -86,6 +86,5 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-    .. &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
 make</userinput></screen>
 
@@ -107,7 +106,7 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
Index: kde4/core/phonon-backend-vlc.xml
===================================================================
--- kde4/core/phonon-backend-vlc.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/core/phonon-backend-vlc.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -88,6 +88,5 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      .. &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
 make</userinput></screen>
 
Index: kde4/core/polkit-qt.xml
===================================================================
--- kde4/core/polkit-qt.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/core/polkit-qt.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -116,5 +116,5 @@
         <seg>None</seg>
         <seg>libpolkit-qt-agent-1.so, libpolkit-qt-core-1.so and libpolkit-qt-gui-1.so</seg>
-	<seg>$KDE4_PREFIX/include/polkit-qt-1</seg>
+	<seg>&kde-dir;/include/polkit-qt-1</seg>
       </seglistitem>
     </segmentedlist>
Index: kde4/core/qimageblitz.xml
===================================================================
--- kde4/core/qimageblitz.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/core/qimageblitz.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -31,5 +31,5 @@
 
     <para><application>QImageblitz</application> is a graphical effect and 
-    filter library for <application>KDE4</application>.</para>
+    filter library for <application>KDE</application>.</para>
 
     &lfs70_checked;
@@ -87,5 +87,5 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX .. &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
 make</userinput></screen>
 
@@ -114,5 +114,5 @@
         <seg>blitztest</seg>
         <seg>libqimageblitz.so</seg>
-	<seg>$KDE4_PREFIX/include/qimageblitz</seg>
+	<seg>&kde-dir;/include/qimageblitz</seg>
       </seglistitem>
     </segmentedlist>
Index: kde4/intro/pre-install-config.xml
===================================================================
--- kde4/intro/pre-install-config.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ kde4/intro/pre-install-config.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -32,5 +32,5 @@
     class='directory'>/opt</filename> hierarchy:</para>
 
-<screen><userinput>export &kde-dir-var;=/opt/kde4</userinput></screen>
+<screen><userinput>export &kde-dir-var;=/opt/kde</userinput></screen>
 
     <para>If you are not installing <application>KDE</application> in
@@ -39,9 +39,8 @@
     system or personal profile:</para>
 
-<screen><userinput>cat &gt; /etc/profile.d/kde4.sh &lt;&lt; "EOF"
-# Begin /etc/profile.d/kde4.sh
+<screen><userinput>cat &gt; /etc/profile.d/kde.sh &lt;&lt; "EOF"
+# Begin /etc/profile.d/kde.sh
 
-&kde-dir-var;=/opt/kde4
-KDE4DIR=&kde-dir;
+&kde-dir-var;=/opt/kde
 KDEDIR=&kde-dir;
 
@@ -50,9 +49,9 @@
 pathappend &kde-dir;/share/pkgconfig PKG_CONFIG_PATH
 pathappend &kde-dir;/share           XDG_DATA_DIRS
-pathappend /etc/kde4/xdg                XDG_CONFIG_DIRS
+pathappend /etc/kde/xdg                XDG_CONFIG_DIRS
 
-export KDE4_PREFIX KDE4DIR KDEDIR
+export &kde-dir-var; KDEDIR
 
-# End /etc/profile.d/kde4.sh
+# End /etc/profile.d/kde.sh
 EOF
 </userinput></screen>
@@ -61,27 +60,13 @@
 
 <screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"
-<literal># Begin kde4 addition
+<literal># Begin kde addition
 
-/opt/kde4/lib
+/opt/kde/lib
 
-# End kde4 addition</literal>
+# End kde addition</literal>
 EOF</userinput></screen>
 
     <indexterm zone="kde-pre-install-config">
       <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para>Add to your <filename>/etc/man_db.conf</filename>:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/man_db.conf &lt;&lt; "EOF"
-<literal># Begin kde4 addition
-
-MANDATORY_MANPATH /opt/kde4/man
-
-# End kde4 addition</literal>
-EOF</userinput></screen>
-
-    <indexterm zone="kde-pre-install-config">
-      <primary sortas="e-etc-man_db.conf">/etc/man_db.conf</primary>
     </indexterm>
 
@@ -91,11 +76,11 @@
     the following symlinks (as the <systemitem class="username">root</systemitem> user):</para>
 
-<screen role="root"><userinput>install -d /opt/kde4/share &amp;&amp;
-ln -svf /usr/share/dbus-1 /opt/kde4/share &amp;&amp;
-ln -svf /usr/share/polkit-1 /opt/kde4/share</userinput></screen>
+<screen role="root"><userinput>install -d &kde-dir;/share &amp;&amp;
+ln -svf /usr/share/dbus-1 &kde-dir;/share &amp;&amp;
+ln -svf /usr/share/polkit-1 &kde-dir;/share</userinput></screen>
     
     <para>D-Bus also needs to find the configuration files for the system-wide 
     bus, which, if you follow the books instructions, are installed in 
-    <filename class="directory">/etc/kde4/dbus-1/system.d</filename>.
+    <filename class="directory">/etc/kde/dbus-1/system.d</filename>.
     Fix this by issuing the following (as 
     <systemitem class="username">root</systemitem>):</para>
@@ -108,5 +93,5 @@
 &lt;busconfig&gt;
 
-  &lt;includedir&gt;/etc/kde4/dbus-1/system.d&lt;/includedir&gt;
+  &lt;includedir&gt;/etc/kde/dbus-1/system.d&lt;/includedir&gt;
 
 &lt;/busconfig&gt;</literal>
@@ -115,16 +100,16 @@
     <tip>
       <para>Sometimes, the installation paths are coded into installed files.
-      This is the reason why <filename class="directory">/opt/kde4</filename>
+      This is the reason why <filename class="directory">/opt/kde</filename>
       is used as installation prefix instead of <filename
       class="directory">/opt/kde-&kde-version;</filename>.  After installing
-      <application>KDE4</application>, you may rename the directory and create
+      <application>KDE</application>, you may rename the directory and create
       a symlink:</para>
 
-<screen role="root"><userinput>mv /opt/kde{4,-&kde-version;} &amp;&amp;
-ln -svf kde-&kde-version; /opt/kde4</userinput></screen>
+<screen role="root"><userinput>mv /opt/kde{,-&kde-version;} &amp;&amp;
+ln -svf kde-&kde-version; /opt/kde</userinput></screen>
 
       <para>Later on, you may want to install other versions of
       <application>KDE</application>.  To do that, just remove the symlink and
-      use <filename class="directory">/opt/kde4</filename> as the prefix again
+      use <filename class="directory">/opt/kde</filename> as the prefix again
       (<application>KDE</application> must not be started). Which version of
       <application>KDE</application> you use depends only on where the symlink
Index: multimedia/audioutils/amarok.xml
===================================================================
--- multimedia/audioutils/amarok.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ multimedia/audioutils/amarok.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -6,5 +6,5 @@
 
   <!ENTITY amarok-download-http "&kde-download-http;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
-  <!ENTITY amarok-download-ftp  "&kde-download-http;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
+  <!ENTITY amarok-download-ftp  "&kde-download-ftp;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
   <!ENTITY amarok-md5sum        "b7983eaa33e4771769ae9e330c811995">
   <!ENTITY amarok-size          "44 MB">
@@ -31,10 +31,10 @@
 
     <para><application>Amarok</application> is a powerful audio player for 
-    the KDE4 environment.
+    the KDE environment.
     Features include a context browser, integration with many online music 
     services and support for management of several digital music players 
     including Apple's iPod.</para>
     
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -104,7 +104,6 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-      -DKDE_DEFAULT_HOME=.kde4 \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DSYSCONF_INSTALL_DIR=/etc/kde \
       .. &amp;&amp;
 make</userinput></screen>
@@ -140,6 +139,6 @@
 	libamarokcore.so, libamaroklib.so, libamarokocsclient.so, 
 	libamarokpud.so, libampache_account_login.so and several
-	libraries in $KDE4_PREFIX/lib/kde4</seg>
-	<seg>several in $KDE4_PREFIX/share</seg>
+	libraries in &kde-dir;/lib/kde4</seg>
+	<seg>several in &kde-dir;/share</seg>
       </seglistitem>
     </segmentedlist>
Index: multimedia/cdwriteutils/k3b.xml
===================================================================
--- multimedia/cdwriteutils/k3b.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ multimedia/cdwriteutils/k3b.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -142,7 +142,6 @@
 
 <screen><userinput>patch -Np1 -i ../k3b-&k3b-version;-ffmpeg_fix-1.patch &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX   \
-      -DKDE_DEFAULT_HOME=.kde4              \
-      -DSYSCONF_INSTALL_DIR=/etc/kde4       \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
+      -DSYSCONF_INSTALL_DIR=/etc/kde        \
       -DK3B_ENABLE_HAL_SUPPORT=OFF          \
       ..  &amp;&amp;
@@ -208,5 +207,5 @@
         <seg>libk3b.so, libk3bdevice.so and numerous
         modules for the installed dependencies</seg>
-        <seg>The following subdirectories of <envar>$KDE_PREFIX</envar>/share/:
+        <seg>The following subdirectories of <envar>&kde-dir;</envar>/share/:
         applnk/Settings/System, apps/k3b, doc/HTML/en/k3b</seg>
       </seglistitem>
Index: server/other/virtuoso.xml
===================================================================
--- server/other/virtuoso.xml	(revision f342c0a95ab477745eab64e3f8c5545d4d67cd89)
+++ server/other/virtuoso.xml	(revision 2cfb44a421b528541de2220908d1c127acbbacad)
@@ -159,5 +159,5 @@
 
     <note><para>If <application>Virtuoso</application> is only to be used
-    for <application>KDE4</application>, there is no need to start the 
+    for <application>KDE</application>, there is no need to start the 
     <application>Virtuoso</application> server at boot time.</para></note>
     
