Index: general/sysutils/strigi.xml
===================================================================
--- general/sysutils/strigi.xml	(revision 739148a8cadb78c59f4a539b7bd36f89a7057e63)
+++ general/sysutils/strigi.xml	(revision ba1e8dd8716260c2e1c75b6ebeb95f58f66a1bcb)
@@ -89,7 +89,12 @@
     commands:</para>
 
-<screen><userinput>mkdir build &amp;&amp;
+<!-- CMAKE_INSTALL_LIBDIR is used so the package doesn't write over lib64 symlink on 64 bit system -->
+<screen><userinput>sed -i "s|BufferedStream :|STREAMS_EXPORT &amp;|" libstreams/include/strigi/bufferedstream.h &amp;&amp;
+mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_INSTALL_LIBDIR=lib  \
+      -DCMAKE_BUILD_TYPE=Release  \
+      .. &amp;&amp;
 make</userinput></screen>
 
@@ -106,4 +111,14 @@
 
     <para>
+      <command>sed -i "..."</command>: This command fixes the build with recent
+      <application>GCC</application> versions.
+    </para>
+
+    <para>
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
+      apply higher level of the compiler optimizations.
+    </para>
+
+    <para>
       <option>-DENABLE_DBUS=OFF</option>: Use this <command>cmake</command>
       variable if you don't have <application>D-Bus</application> installed.
@@ -116,4 +131,5 @@
       <application>D-Bus</application> support.
     </para>
+
   </sect2>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 739148a8cadb78c59f4a539b7bd36f89a7057e63)
+++ introduction/welcome/changelog.xml	(revision ba1e8dd8716260c2e1c75b6ebeb95f58f66a1bcb)
@@ -48,4 +48,8 @@
       <itemizedlist>
         <listitem>
+          <para>[fernando] - KDE related fixes (patch received, thanks). Fixes
+          <ulink url="&blfs-ticket-root;4517">#4517</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Patch libcap to fix the uapi/linux include scheme, reported
           by Armin K. Fixes <ulink url="&blfs-ticket-root;4508">#4508</ulink>.</para>
Index: kde/core/attica.xml
===================================================================
--- kde/core/attica.xml	(revision 739148a8cadb78c59f4a539b7bd36f89a7057e63)
+++ kde/core/attica.xml	(revision ba1e8dd8716260c2e1c75b6ebeb95f58f66a1bcb)
@@ -61,6 +61,13 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="qt4"/> and
-    <xref linkend="cmake"/>
+      <xref linkend="cmake"/> and
+      <xref linkend="qt4"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="qt5"/> (requires
+      <ulink url="http://quickgit.kde.org/index.php?p=extra-cmake-modules.git">
+      extra-cmake-modules</ulink>)
     </para>
 
@@ -81,4 +88,5 @@
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
       -DCMAKE_BUILD_TYPE=Release         \
+      -DQT4_BUILD=ON                     \
       .. &amp;&amp;
 make</userinput></screen>
@@ -95,6 +103,15 @@
     <title>Command Explanations</title>
 
-    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to apply
-    a higher level of compiler optimizations.</para>
+    <para>
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
+      to apply a higher level of compiler the optimizations.
+    </para>
+
+    <para>
+      <parameter>-DQT4_BUILD=ON</parameter>: This switch forces the package
+      to build against <application>Qt4</application> even if
+      <application>Qt5</application> is present on the system. Remove it if
+       you want to build the package against <application>Qt5</application>.
+    </para>
 
   </sect2>
Index: kde/core/kde-runtime.xml
===================================================================
--- kde/core/kde-runtime.xml	(revision 739148a8cadb78c59f4a539b7bd36f89a7057e63)
+++ kde/core/kde-runtime.xml	(revision ba1e8dd8716260c2e1c75b6ebeb95f58f66a1bcb)
@@ -113,7 +113,8 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DSYSCONF_INSTALL_DIR=/etc         \
-      -DCMAKE_BUILD_TYPE=Release         \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;         \
+      -DSYSCONF_INSTALL_DIR=/etc                 \
+      -DCMAKE_BUILD_TYPE=Release                 \
+      -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \
       .. &amp;&amp;
 make</userinput></screen>
@@ -124,5 +125,17 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-ln -s -v ../lib/kde4/libexec/kdesu &kde-dir;/bin/kdesu</userinput></screen>
+ln -sfv ../lib/kde4/libexec/kdesu &kde-dir;/bin/kdesu</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>-DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0</parameter>:
+      This switch is used so that <application>CMake</application> can
+      properly find <application>Samba</application> headers which got
+      moved in version 4.
+    </para>
 
   </sect2>
Index: kde/core/phonon-backend-gstreamer.xml
===================================================================
--- kde/core/phonon-backend-gstreamer.xml	(revision 739148a8cadb78c59f4a539b7bd36f89a7057e63)
+++ kde/core/phonon-backend-gstreamer.xml	(revision ba1e8dd8716260c2e1c75b6ebeb95f58f66a1bcb)
@@ -88,4 +88,5 @@
 
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_INSTALL_LIBDIR=lib         \
       -DCMAKE_BUILD_TYPE=Release         \
       .. &amp;&amp;
Index: kde/core/phonon-backend-vlc.xml
===================================================================
--- kde/core/phonon-backend-vlc.xml	(revision 739148a8cadb78c59f4a539b7bd36f89a7057e63)
+++ kde/core/phonon-backend-vlc.xml	(revision ba1e8dd8716260c2e1c75b6ebeb95f58f66a1bcb)
@@ -80,4 +80,5 @@
 
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_INSTALL_LIBDIR=lib         \
       -DCMAKE_BUILD_TYPE=Release         \
       .. &amp;&amp;
Index: kde/core/phonon.xml
===================================================================
--- kde/core/phonon.xml	(revision 739148a8cadb78c59f4a539b7bd36f89a7057e63)
+++ kde/core/phonon.xml	(revision ba1e8dd8716260c2e1c75b6ebeb95f58f66a1bcb)
@@ -62,12 +62,13 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="automoc4"/> and
-    <xref linkend="glib2"/>
+      <xref linkend="automoc4"/> and
+      <xref linkend="glib2"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend='pulseaudio'/> and
-    <ulink url="http://projects.kde.org/projects/kdesupport/libqzeitgeist/">QZeitgeist</ulink>
+      <xref linkend="pulseaudio"/>,
+      <xref linkend="qt5"/> and
+      <ulink url="http://projects.kde.org/projects/kdesupport/libqzeitgeist/">QZeitgeist</ulink>
     </para>
 
@@ -87,4 +88,5 @@
     commands:</para>
 
+<!-- CMAKE_INSTALL_LIBDIR is used so the package doesn't write over lib64 symlink on 64 bit system -->
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
@@ -92,4 +94,5 @@
 cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
       -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_LIBDIR=lib \
       -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \
       -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces \
@@ -106,13 +109,26 @@
     <title>Command Explanations</title>
 
-    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to apply
-    higher level of compiler optimizations.</para>
+    <para>
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
+      to apply higher level of the compiler optimizations.
+    </para>
 
-    <para><option>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE</option>:
-    This option ensures that the plugins and mkspecs files get installed in
-    the correct location.</para>
+    <para>
+      <parameter>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE</parameter>:
+      This switch ensures that the plugins and mkspecs files get installed in
+      the correct location.
+    </para>
 
-    <para><option>-DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces</option>:
-    This option sets the correct installation path for a D-Bus interfaces file.
+    <para>
+     <parameter>-DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces</parameter>:
+      This switch sets the correct installation path for the 
+      <application>D-Bus</application> interfaces file.
+    </para>
+
+    <para>
+      <option>-DPHONON_BUILD_PHONON4QT5=ON</option>: Use this switch if you want to
+      build <application>Phonon</application> against <application>Qt5</application>.
+      Note that both <application>Qt4</application> and <application>Qt5</application>
+      versions can be installed at the same time without any conflicts.
     </para>
 
@@ -128,7 +144,16 @@
 
       <seglistitem>
-        <seg>none</seg>
-        <seg>libphonon.so and libphononexperimental.so</seg>
-        <seg>none</seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libphonon.so and
+          libphononexperimental.so
+        </seg>
+        <seg>
+          &qt4-dir;/include/KDE/Phonon,
+          &qt4-dir;/include/phonon, and
+          &qt4-dir;/share/phonon
+        </seg>
       </seglistitem>
     </segmentedlist>
