Index: kde/core/akonadi.xml
===================================================================
--- kde/core/akonadi.xml	(revision 07191f0d284897ca477402b6bf17a96aa50a5fcd)
+++ kde/core/akonadi.xml	(revision bb8b9b5ea21db8638fcb5b2c011166a19facaa8e)
@@ -7,6 +7,6 @@
   <!ENTITY akonadi-download-http "&kde-download-http;akonadi/src/akonadi-&akonadi-version;.tar.bz2">
   <!ENTITY akonadi-download-ftp  "&kde-download-ftp;akonadi/src/akonadi-&akonadi-version;.tar.bz2">
-  <!ENTITY akonadi-md5sum        "bdce288f4b91055d69f35c26dab276d0">
-  <!ENTITY akonadi-size          "221 KB">
+  <!ENTITY akonadi-md5sum        "35eb8f76588b1d111f75bc46e3ac784b">
+  <!ENTITY akonadi-size          "224 KB">
   <!ENTITY akonadi-buildsize     "41 MB">
   <!ENTITY akonadi-time          "1.9 SBU">
@@ -59,13 +59,4 @@
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/akonadi-&akonadi-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
     <bridgehead renderas="sect3">Akonadi Dependencies</bridgehead>
 
@@ -87,9 +78,4 @@
   <sect2 role="installation">
     <title>Installation of Akonadi</title>
-
-    <para>Apply the following sed if using <application>MySQL</application>
-    5.6:</para>
-    
-<screen><userinput>sed -i 's@table_cache@table_open_cache@' server/src/storage/mysql*</userinput></screen>
     
     <para>Install <application>Akonadi</application> by running the following
Index: kde/core/attica.xml
===================================================================
--- kde/core/attica.xml	(revision 07191f0d284897ca477402b6bf17a96aa50a5fcd)
+++ kde/core/attica.xml	(revision bb8b9b5ea21db8638fcb5b2c011166a19facaa8e)
@@ -5,7 +5,7 @@
   %general-entities;
 
-  <!ENTITY attica-download-http "http://mirrors.isc.org/pub/kde/stable/attica/attica-&attica-version;.tar.bz2">
-  <!ENTITY attica-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/attica/attica-&attica-version;.tar.bz2">
-  <!ENTITY attica-md5sum        "b90983ec5d79e5ddcbc9146fa23cab72">
+  <!ENTITY attica-download-http "&kde-download-http;attica/attica-&attica-version;.tar.bz2">
+  <!ENTITY attica-download-ftp  "&kde-download-ftp;attica/attica-&attica-version;.tar.bz2">
+  <!ENTITY attica-md5sum        "d62c5c9489a68432e8d990dde7680c24">
   <!ENTITY attica-size          "59 KB">
   <!ENTITY attica-buildsize     "7.5 MB">
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="attica" xreflabel="attica-&attica-version;">
+<sect1 id="attica" xreflabel="Attica-&attica-version;">
   <?dbhtml filename="attica.html"?>
 
@@ -57,14 +57,4 @@
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/attica-&attica-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-
     <bridgehead renderas="sect3">Attica Dependencies</bridgehead>
 
@@ -83,10 +73,12 @@
     <title>Installation of Attica</title>
 
-    <para>Install <application>attica</application> by running the following
+    <para>Install <application>Attica</application> by running the following
     commands:</para>
 
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release \
+      .. &amp;&amp;
 make</userinput></screen>
 
@@ -98,12 +90,13 @@
 
   </sect2>
-<!--
+
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
+    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to apply
+    a higher level of compiler optimizations.</para>
 
   </sect2>
--->
+
   <sect2 role="content">
     <title>Contents</title>
Index: kde/core/automoc4.xml
===================================================================
--- kde/core/automoc4.xml	(revision 07191f0d284897ca477402b6bf17a96aa50a5fcd)
+++ kde/core/automoc4.xml	(revision bb8b9b5ea21db8638fcb5b2c011166a19facaa8e)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY automoc4-download-http "http://mirrors.isc.org/pub/kde/stable/automoc4/&automoc4-version;/automoc4-&automoc4-version;.tar.bz2">
-  <!ENTITY automoc4-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/automoc4/&automoc4-version;/automoc4-&automoc4-version;.tar.bz2">
+  <!ENTITY automoc4-download-http "&kde-download-http;automoc4/&automoc4-version;/automoc4-&automoc4-version;.tar.bz2">
+  <!ENTITY automoc4-download-ftp  "&kde-download-ftp;automoc4/&automoc4-version;/automoc4-&automoc4-version;.tar.bz2">
   <!ENTITY automoc4-md5sum        "91bf517cb940109180ecd07bc90c69ec">
   <!ENTITY automoc4-size          "0.9 MB">
Index: kde/core/phonon-backend-gstreamer.xml
===================================================================
--- kde/core/phonon-backend-gstreamer.xml	(revision 07191f0d284897ca477402b6bf17a96aa50a5fcd)
+++ kde/core/phonon-backend-gstreamer.xml	(revision bb8b9b5ea21db8638fcb5b2c011166a19facaa8e)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!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-download-http "&kde-download-http;phonon/phonon-backend-gstreamer/&phonon-backend-gstreamer-version;/src/phonon-backend-gstreamer-&phonon-backend-gstreamer-version;.tar.xz">
+  <!ENTITY phonon-backend-gstreamer-download-ftp  "&kde-download-ftp;phonon/phonon-backend-gstreamer/&phonon-backend-gstreamer-version;/src/phonon-backend-gstreamer-&phonon-backend-gstreamer-version;.tar.xz">
   <!ENTITY phonon-backend-gstreamer-md5sum        "d7b0b6245f380347c52c09033a814931">
   <!ENTITY phonon-backend-gstreamer-size          "72 KB">
Index: kde/core/phonon-backend-vlc.xml
===================================================================
--- kde/core/phonon-backend-vlc.xml	(revision 07191f0d284897ca477402b6bf17a96aa50a5fcd)
+++ kde/core/phonon-backend-vlc.xml	(revision bb8b9b5ea21db8638fcb5b2c011166a19facaa8e)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY phonon-backend-vlc-download-http "http://mirrors.isc.org/pub/kde/stable/phonon/phonon-backend-vlc/&phonon-backend-vlc-version;/phonon-backend-vlc-&phonon-backend-vlc-version;.tar.xz">
-  <!ENTITY phonon-backend-vlc-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/phonon/phonon-backend-vlc/&phonon-backend-vlc-version;/phonon-backend-vlc-&phonon-backend-vlc-version;.tar.xz">
+  <!ENTITY phonon-backend-vlc-download-http "&kde-download-http;phonon/phonon-backend-vlc/&phonon-backend-vlc-version;/phonon-backend-vlc-&phonon-backend-vlc-version;.tar.xz">
+  <!ENTITY phonon-backend-vlc-download-ftp  "&kde-download-ftp;phonon/phonon-backend-vlc/&phonon-backend-vlc-version;/phonon-backend-vlc-&phonon-backend-vlc-version;.tar.xz">
   <!ENTITY phonon-backend-vlc-md5sum        "1ae8b15594714841d2bcf8c72813a176">
   <!ENTITY phonon-backend-vlc-size          "56 KB">
Index: kde/core/phonon.xml
===================================================================
--- kde/core/phonon.xml	(revision 07191f0d284897ca477402b6bf17a96aa50a5fcd)
+++ kde/core/phonon.xml	(revision bb8b9b5ea21db8638fcb5b2c011166a19facaa8e)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY phonon-download-http "http://mirrors.isc.org/pub/kde/stable/phonon/&phonon-version;/src/phonon-&phonon-version;.tar.xz">
-  <!ENTITY phonon-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/phonon/&phonon-version;/src/phonon-&phonon-version;.tar.xz">
+  <!ENTITY phonon-download-http "&kde-download-http;phonon/&phonon-version;/src/phonon-&phonon-version;.tar.xz">
+  <!ENTITY phonon-download-ftp  "&kde-download-ftp;phonon/&phonon-version;/src/phonon-&phonon-version;.tar.xz">
   <!ENTITY phonon-md5sum        "bbe0c1c62ed14c31479c4c1a6cf1e173">
   <!ENTITY phonon-size          "275 KB">
Index: kde/core/polkit-kde-agent.xml
===================================================================
--- kde/core/polkit-kde-agent.xml	(revision 07191f0d284897ca477402b6bf17a96aa50a5fcd)
+++ kde/core/polkit-kde-agent.xml	(revision bb8b9b5ea21db8638fcb5b2c011166a19facaa8e)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY polkit-kde-agent-download-http "http://mirrors.isc.org/pub/kde/stable/apps/KDE4.x/admin/polkit-kde-agent-1-&polkit-kde-agent-version;.tar.bz2">
-  <!ENTITY polkit-kde-agent-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/polkit-kde-agent-1-&polkit-kde-agent-version;.tar.bz2">
+  <!ENTITY polkit-kde-agent-download-http "&kde-download-http;apps/KDE4.x/admin/polkit-kde-agent-1-&polkit-kde-agent-version;.tar.bz2">
+  <!ENTITY polkit-kde-agent-download-ftp  "&kde-download-ftp;apps/KDE4.x/admin/polkit-kde-agent-1-&polkit-kde-agent-version;.tar.bz2">
   <!ENTITY polkit-kde-agent-md5sum        "a02d3fddc6270a88bceaf3ba604c92f8">
   <!ENTITY polkit-kde-agent-size          "34 KB">
Index: kde/core/polkit-qt.xml
===================================================================
--- kde/core/polkit-qt.xml	(revision 07191f0d284897ca477402b6bf17a96aa50a5fcd)
+++ kde/core/polkit-qt.xml	(revision bb8b9b5ea21db8638fcb5b2c011166a19facaa8e)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY polkit-qt-download-http "http://mirrors.isc.org/pub/kde/stable/apps/KDE4.x/admin/polkit-qt-1-&polkit-qt-version;.tar.bz2">
-  <!ENTITY polkit-qt-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/polkit-qt-1-&polkit-qt-version;.tar.bz2">
+  <!ENTITY polkit-qt-download-http "&kde-download-http;apps/KDE4.x/admin/polkit-qt-1-&polkit-qt-version;.tar.bz2">
+  <!ENTITY polkit-qt-download-ftp  "&kde-download-ftp;apps/KDE4.x/admin/polkit-qt-1-&polkit-qt-version;.tar.bz2">
   <!ENTITY polkit-qt-md5sum        "a105e233e6733fb072c9080cd7ae1af2">
   <!ENTITY polkit-qt-size          "67 KB">
Index: kde/core/qimageblitz.xml
===================================================================
--- kde/core/qimageblitz.xml	(revision 07191f0d284897ca477402b6bf17a96aa50a5fcd)
+++ kde/core/qimageblitz.xml	(revision bb8b9b5ea21db8638fcb5b2c011166a19facaa8e)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY qimageblitz-download-http "http://mirrors.isc.org/pub/kde/stable/qimageblitz/qimageblitz-&qimageblitz-version;.tar.bz2">
-  <!ENTITY qimageblitz-download-ftp  "ftp://ftp.kde.org/pub/kde/stable/qimageblitz/qimageblitz-&qimageblitz-version;.tar.bz2">
+  <!ENTITY qimageblitz-download-http "&kde-download-http;qimageblitz/qimageblitz-&qimageblitz-version;.tar.bz2">
+  <!ENTITY qimageblitz-download-ftp  "&kde-download-ftp;qimageblitz/qimageblitz-&qimageblitz-version;.tar.bz2">
   <!ENTITY qimageblitz-md5sum        "0ae2f7d4e0876764a97ca73799f61df4">
   <!ENTITY qimageblitz-size          "57 KB">
Index: kde/core/shrdesktopontologies.xml
===================================================================
--- kde/core/shrdesktopontologies.xml	(revision 07191f0d284897ca477402b6bf17a96aa50a5fcd)
+++ kde/core/shrdesktopontologies.xml	(revision bb8b9b5ea21db8638fcb5b2c011166a19facaa8e)
@@ -5,10 +5,11 @@
   %general-entities;
 
-  <!ENTITY shared-desktop-ontologies-download-http "&sourceforge-repo;/oscaf/shared-desktop-ontologies-&shared-desktop-ontologies-version;.tar.bz2">
+  <!ENTITY shared-desktop-ontologies-download-http
+           "&sourceforge-repo;/oscaf/shared-desktop-ontologies-&shared-desktop-ontologies-version;.tar.bz2">
   <!ENTITY shared-desktop-ontologies-download-ftp  " ">
-  <!ENTITY shared-desktop-ontologies-md5sum        "bfb7b5acbb43e5e45466c87dbe9c45b7">
+  <!ENTITY shared-desktop-ontologies-md5sum        "db75d155ac9b60e3d187e23544744acc">
   <!ENTITY shared-desktop-ontologies-size          "3.8 MB">
   <!ENTITY shared-desktop-ontologies-buildsize     "6.7 MB">
-  <!ENTITY shared-desktop-ontologies-time          "&lt;0.1 SBU">
+  <!ENTITY shared-desktop-ontologies-time          "less than 0.1 SBU">
 ]>
 
