diff --git a/desktop/kde/addon/libdmtx/pspec.xml b/desktop/kde/addon/libdmtx/pspec.xml
index 6877e15e77..c31838e6b9 100644
--- a/desktop/kde/addon/libdmtx/pspec.xml
+++ b/desktop/kde/addon/libdmtx/pspec.xml
@@ -13,16 +13,10 @@
         <Summary>A Library for working with Data Matrix 2D bar-codes</Summary>
         <Description>libdmtx is an open source software for reading and writing Data Matrix 2D bar-codes on Linux, Unix, OS X, Windows and mobile devices.</Description>
         <Archive sha1sum="7a353da736cf37e8730e2c22aca4629035aeadcd" type="targz">http://sourceforge.net/projects/libdmtx/files/libdmtx/0.7.4/libdmtx-0.7.4.tar.gz</Archive>
-        <BuildDependencies>
-            <Dependency>imagemagick-devel</Dependency>
-        </BuildDependencies>
     </Source>
 
     <Package>
         <Name>libdmtx</Name>
-        <RuntimeDependencies>
-            <Dependency>imagemagick</Dependency>
-        </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
diff --git a/desktop/kde/addon/prison-qt5/actions.py b/desktop/kde/addon/prison-qt5/actions.py
index edfeced426..2799786d29 100644
--- a/desktop/kde/addon/prison-qt5/actions.py
+++ b/desktop/kde/addon/prison-qt5/actions.py
@@ -8,7 +8,7 @@ from pisi.actionsapi import kde5
 from pisi.actionsapi import pisitools
 
 def setup():
-    kde5.configure()
+    kde5.configure("-DQT5_BUILD=ON")
 
 def build():
     kde5.make()
diff --git a/desktop/kde/addon/prison-qt5/pspec.xml b/desktop/kde/addon/prison-qt5/pspec.xml
index 6d40adebed..a1614a998e 100644
--- a/desktop/kde/addon/prison-qt5/pspec.xml
+++ b/desktop/kde/addon/prison-qt5/pspec.xml
@@ -12,9 +12,12 @@
         <IsA>library</IsA>
         <Summary>A barcode API to produce QRCode barcodes and DataMatrix barcode</Summary>
         <Description>A barcode API to produce QRCode barcodes and DataMatrix barcode.</Description>
-        <Archive sha1sum="69dbbf94888ec1fb5b041ae4d0b6cac864abc15e" type="tarxz">http://download.kde.org/stable/prison/1.1/src/prison-1.1.0.tar.xz</Archive>
+        <Archive sha1sum="1fb50581f69e74bec588be9a6db88e39f5606f9b" type="tarxz">http://source.pisilinux.org/1.0/prison-1.1.1_20150821.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency>python3-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>libdmtx-devel</Dependency>
+            <Dependency>qrencode-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
             <Dependency>mesa-devel</Dependency>
         </BuildDependencies>
     </Source>
@@ -22,7 +25,7 @@
     <Package>
         <Name>prison-qt5</Name>
         <RuntimeDependencies>
-            <Dependency>qt</Dependency>
+            <Dependency>qt5-base</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>mesa</Dependency>
             <Dependency>libdmtx</Dependency>
@@ -32,12 +35,6 @@
             <Path fileType="executable">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
-        <Replaces>
-          <Package>prison</Package>
-        </Replaces>
-        <Conflicts>
-          <Package>prison</Package>
-        </Conflicts>
     </Package>
 
     <Package>
@@ -50,18 +47,12 @@
             <Path fileType="header">/usr/include</Path>
             <Path fileType="config">/usr/lib/pkgconfig</Path>
         </Files>
-        <Replaces>
-          <Package>prison-devel</Package>
-        </Replaces>
-        <Conflicts>
-          <Package>prison-devel</Package>
-        </Conflicts>
     </Package>
 
     <History>
         <Update release="1">
-            <Date>2015-06-29</Date>
-            <Version>1.1.0</Version>
+            <Date>2015-08-22</Date>
+            <Version>1.1.1_20150821</Version>
             <Comment>First Release.</Comment>
             <Name>Stefan Gronewold(groni)</Name>
             <Email>groni@pisilinux.org</Email>
diff --git a/desktop/kde/addon/qrencode/pspec.xml b/desktop/kde/addon/qrencode/pspec.xml
index 84d85941d1..9556846094 100644
--- a/desktop/kde/addon/qrencode/pspec.xml
+++ b/desktop/kde/addon/qrencode/pspec.xml
@@ -16,6 +16,8 @@
         <BuildDependencies>
             <Dependency>libsdl-devel</Dependency> <!-- This is for a specific test -->
             <Dependency>m4</Dependency>
+            <Dependency>gettext-devel</Dependency>
+            <Dependency>libpng-devel</Dependency>
         </BuildDependencies>
     </Source>
 
diff --git a/desktop/kde/application/akonadi/actions.py b/desktop/kde/application/akonadi/actions.py
index 3b3a49d998..ed7467a16c 100644
--- a/desktop/kde/application/akonadi/actions.py
+++ b/desktop/kde/application/akonadi/actions.py
@@ -4,17 +4,17 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file http://www.gnu.org/licenses/gpl.txt
 
-from pisi.actionsapi import kde4
+from pisi.actionsapi import kde5
 from pisi.actionsapi import pisitools
 
 def setup():
-     kde4.configure("-DCMAKE_BUILD_TYPE=Release \
-                     -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \
-                     -DWITH_SOPRANO=OFF")
+    kde5.configure("-DCMAKE_BUILD_TYPE=Release \
+                    -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \
+                    -DWITH_SOPRANO=OFF")
 
 def build():
-    kde4.make()
+    kde5.make()
 
 def install():
-    kde4.install()
+    kde5.install()
     pisitools.dodoc("AUTHORS", "NEWS", "README")
diff --git a/desktop/kde/application/akonadi/pspec.xml b/desktop/kde/application/akonadi/pspec.xml
index 415a8761b4..f302aadb1a 100644
--- a/desktop/kde/application/akonadi/pspec.xml
+++ b/desktop/kde/application/akonadi/pspec.xml
@@ -21,13 +21,13 @@
             <Dependency>qt5-sql-odbc</Dependency>
             <Dependency>qt5-sql-postgresql</Dependency>
             <Dependency>sqlite-devel</Dependency>
-            <!--Dependency>soprano-devel</Dependency-->
             <Dependency>shared-mime-info</Dependency>
             <Dependency>mariadb-client</Dependency>
             <Dependency>mariadb-server</Dependency>
             <Dependency>postgresql-server</Dependency>
             <Dependency>libxslt-devel</Dependency>
             <Dependency>boost-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
         </BuildDependencies>
         <Patches>
 <!--             <Patch level="1">dbupdater.diff</Patch> -->
@@ -50,6 +50,7 @@
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="data">/usr/share/dbus-1</Path>
             <Path fileType="data">/usr/share/mime</Path>
+            <Path fileType="data">/usr/share/config/akonadi*</Path>
             <Path fileType="data">/usr/share/kde4</Path>
             <Path fileType="doc">/usr/share/doc/</Path>
         </Files>
diff --git a/desktop/kde/application/kcalcore/actions.py b/desktop/kde/application/kcalcore/actions.py
index 9083d58f59..1e150daf0c 100755
--- a/desktop/kde/application/kcalcore/actions.py
+++ b/desktop/kde/application/kcalcore/actions.py
@@ -6,7 +6,6 @@
 
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import kde5
-from pisi.actionsapi import get
 
 def setup():
     kde5.configure()
diff --git a/desktop/kde/application/kcalcore/pspec.xml b/desktop/kde/application/kcalcore/pspec.xml
index 431cc57611..18b0b22027 100755
--- a/desktop/kde/application/kcalcore/pspec.xml
+++ b/desktop/kde/application/kcalcore/pspec.xml
@@ -10,16 +10,21 @@
         </Packager>
         <License>LGPLv2</License>
         <IsA>library</IsA>
-	<IsA>app:library</IsA>
-        <Summary>The KDE calendar access library</Summary>
-        <Description>Access Library for the Calendar in KDE</Description>
+        <IsA>app:console</IsA>
+        <Summary>the KDE calendar access library.</Summary>
+        <Description>A calendar contains information like incidences (events, to-dos, journals), alarms, time zones, and other useful information.</Description>
         <Archive sha1sum="6ed748d61ed2c9ca872c1d53bcdc3521737cdab7" type="tarxz">http://download.kde.org/stable/applications/15.08.0/src/kcalcore-15.08.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>kdelibs4-support-devel</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>kdesignerplugin</Dependency>
             <Dependency>kdoctools-devel</Dependency>
-            <Dependency>libical-devel</Dependency>            
+            <Dependency>kemoticons-devel</Dependency>
+            <Dependency>kitemmodels-devel</Dependency>
+            <Dependency>kinit-devel</Dependency>
+            <Dependency>kunitconversion-devel</Dependency>
+            <Dependency>libical-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -27,42 +32,42 @@
         <Name>kcalcore</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
-            <Dependency>kdelibs4-support</Dependency>
-            <Dependency>libical</Dependency>
-            <Dependency>libgcc</Dependency>
             <Dependency>kcodecs</Dependency>
             <Dependency>kconfig</Dependency>
             <Dependency>kcoreaddons</Dependency>
-            <Dependency>libutil-linux</Dependency>            
+            <Dependency>libical</Dependency>
+            <Dependency>kdelibs4-support</Dependency>
+            <Dependency>libgcc</Dependency>
         </RuntimeDependencies>
         <Files>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
-            <Path fileType="doc">/usr/share/doc</Path>	    
+            <Path fileType="data">/usr/share</Path>	    
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
     
     <Package>
         <Name>kcalcore-devel</Name>
-	<Summary>Development files for kcalcore</Summary>
+        <Summary>Development files for kcontacts</Summary>
         <RuntimeDependencies>
-	    <Dependency>qt5-base-devel</Dependency>
-            <Dependency release="current">kcalcore</Dependency>
+           <Dependency>qt5-base-devel</Dependency>
+            <Dependency release="current">kcalcore</Dependency>	    
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="data">/usr/lib/cmake</Path>
-	    <Path fileType="config">/usr/lib/pkgconfig</Path>
+            <Path fileType="config">/usr/lib/pkgconfig</Path>
         </Files>
     </Package>
 
     <History>
         <Update release="1">
-            <Date>2015-08-22</Date>
+            <Date>2015-08-20</Date>
             <Version>15.08.0</Version>
             <Comment>First Release</Comment>
             <Name>Stefan Gronewold (groni)</Name>
             <Email>groni@pisilinux.org</Email>
-        </Update>     
+        </Update>
     </History>
 </PISI>
diff --git a/desktop/kde/application/kdepimlibs/pspec.xml b/desktop/kde/application/kdepimlibs/pspec.xml
index 527429942c..444f1f9263 100644
--- a/desktop/kde/application/kdepimlibs/pspec.xml
+++ b/desktop/kde/application/kdepimlibs/pspec.xml
@@ -17,9 +17,14 @@
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>boost-devel</Dependency>
             <Dependency>gpgme-devel</Dependency>
-            <!--Dependency>prison-devel</Dependeny-->
+            <Dependency>qt5-sql-sqlite</Dependency>
+            <Dependency>qt5-sql-mysql</Dependency>
+            <Dependency>qt5-sql-odbc</Dependency>
+            <Dependency>qt5-sql-postgresql</Dependency>
+            <Dependency>prison-qt5-devel</Dependency>
+            <Dependency>kmbox-devel</Dependency>
             <Dependency>qt5-phonon-devel</Dependency>
-            <!--Dependency>akonadi-devel</Dependency-->
+            <Dependency>akonadi-devel</Dependency>
             <Dependency>libical-devel</Dependency>
             <Dependency>libqjson-devel</Dependency>
             <Dependency>libgpg-error-devel</Dependency>
@@ -34,11 +39,12 @@
             <Dependency>kemoticons-devel</Dependency>
             <Dependency>kitemmodels-devel</Dependency>
             <Dependency>kinit-devel</Dependency>
-            <Dependency>kunitconversion-devel</Dependency>
-            <!--Dependency versionFrom="4.14.3">kdelibs-devel</Dependency>
-            <Dependency versionFrom="4.14.3">nepomuk-core-devel</Dependency> -->
-             <Dependency>extra-cmake-modules</Dependency>
-             <!--Dependency>akonadi-devel</Dependency-->
+            <Dependency>kunitconversion-devel</Dependency>           
+            <Dependency>kmime-devel</Dependency>
+            <Dependency>kcontacts-devel</Dependency>
+            <Dependency>kcalcore-devel</Dependency>
+            <Dependency>kldap-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -46,22 +52,44 @@
         <Name>kdepimlibs</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
-            <Dependency>gpgme</Dependency>
+            <Dependency>kio</Dependency>
+            <Dependency>ki18n</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>kcodecs</Dependency>
+            <Dependency>kmime</Dependency>
+            <Dependency>kldap</Dependency>
+            <Dependency>kxmlgui</Dependency>
+            <Dependency>kcalcore</Dependency>
+            <Dependency>kcontacts</Dependency>
+            <Dependency>kconfig</Dependency>
+            <Dependency>libxml2</Dependency>
+            <Dependency>kservice</Dependency>
+            <Dependency>kguiaddons</Dependency>
+            <Dependency>kitemviews</Dependency>
+            <Dependency>kcompletion</Dependency>
+            <Dependency>kcoreaddons</Dependency>
+            <Dependency>kdbusaddons</Dependency>
+            <Dependency>kiconthemes</Dependency>
+            <Dependency>kitemmodels</Dependency>
+            <Dependency>ktextwidgets</Dependency>
+            <Dependency>kconfigwidgets</Dependency>
+            <Dependency>kwidgetsaddons</Dependency>
+            <Dependency>kdelibs4-support</Dependency>
             <Dependency>qt5-phonon</Dependency>
-            <!--Dependency>prison</Dependency>
-            <Dependency>akonadi</Dependency-->
-            <Dependency>libical</Dependency>
-            <Dependency>libqjson</Dependency>
+            <Dependency>prison-qt5</Dependency>
+            <Dependency>akonadi</Dependency>
             <Dependency releaseFrom="5">cyrus-sasl</Dependency>
-            <Dependency versionFrom="4.14.3">kdelibs</Dependency>
-            <Dependency releaseFrom="4">openldap-client</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="data">/usr/mkspecs/</Path>
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="data">/usr/share/kde4</Path>
             <Path fileType="data">/usr/share/mime</Path>
+            <Path fileType="data">/usr/share/icons</Path>
+            <Path fileType="data">/usr/share/kservices5</Path>
+            <Path fileType="data">/usr/share/kservicetypes5</Path>
             <Path fileType="data">/usr/share/dbus-1</Path>
             <Path fileType="data">/usr/share/config.kcfg</Path>
             <Path fileType="data">/usr/share/akonadi/agents/knutresource.desktop</Path>
@@ -73,9 +101,8 @@
         <Summary>Development package for KDE4 PIM libraries</Summary>
         <Description>Contains development tools and header files for KDE4 PIM (Personal Information Management) base libraries.</Description>
         <RuntimeDependencies>
-            <Dependency>qt-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
             <Dependency>boost-devel</Dependency>
-            <Dependency>kdelibs-devel</Dependency>
             <Dependency release="current">kdepimlibs</Dependency>
         </RuntimeDependencies>
         <Files>
diff --git a/desktop/kde/application/kldap/pspec.xml b/desktop/kde/application/kldap/pspec.xml
index e843bd88af..fc1da454be 100755
--- a/desktop/kde/application/kldap/pspec.xml
+++ b/desktop/kde/application/kldap/pspec.xml
@@ -18,7 +18,8 @@
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>kcompletion-devel</Dependency>
             <Dependency>ki18n-devel</Dependency>
-            <Dependency>cmake</Dependency>
+            <Dependency>openldap-client</Dependency>
+            <Dependency>cyrus-sasl-devel</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
         </BuildDependencies>
     </Source>
@@ -31,7 +32,7 @@
             <Dependency>ki18n</Dependency>
             <Dependency>libgcc</Dependency>
             <Dependency>cyrus-sasl</Dependency>
-            <Dependency>openladap-client</Dependency>
+            <Dependency>openldap-client</Dependency>
             <Dependency>kwidgetsaddons</Dependency>
         </RuntimeDependencies>
         <Files>	    
@@ -46,7 +47,7 @@
         <Name>kldap-devel</Name>
 	<Summary>Development files for kdelibs4-support</Summary>
         <RuntimeDependencies>
-	    <Dependency>qt5-devel</Dependency>
+	    <Dependency>qt5-base-devel</Dependency>
             <Dependency release="current">kldap</Dependency>
         </RuntimeDependencies>
         <Files>
diff --git a/desktop/kde/application/kmbox/actions.py b/desktop/kde/application/kmbox/actions.py
index 3debf3e685..7b7a4739b4 100755
--- a/desktop/kde/application/kmbox/actions.py
+++ b/desktop/kde/application/kmbox/actions.py
@@ -15,5 +15,5 @@ def build():
 
 def install():
     kde5.install()
-    #pisitools.insinto("/usr/include/KF5/KMbox", "/usr/include/KF5/kmbox_version.h")
-    #pisitools.dodoc("COPYING.LIB", "README", "CHANGELOG", "AUTHORS")
+    
+    pisitools.dodoc("COPYING.LIB")
diff --git a/desktop/kde/application/kmbox/pspec.xml b/desktop/kde/application/kmbox/pspec.xml
index b6e1a5140d..da04c4b1f4 100755
--- a/desktop/kde/application/kmbox/pspec.xml
+++ b/desktop/kde/application/kmbox/pspec.xml
@@ -10,18 +10,15 @@
         </Packager>
         <License>LGPLv2</License>
         <IsA>library</IsA>
-	<IsA>app:library</IsA>
-        <Summary>Library for accessing mail storages in MBox format</Summary>
-        <Description>Library for accessing mail storages in MBox format</Description>
+        <IsA>app:console</IsA>
+        <Summary>MBox library support.</Summary>
+        <Description>MBox library support.</Description>
         <Archive sha1sum="de20a8cdfa0195e34da707943800121389be870a" type="tarxz">http://download.kde.org/stable/applications/15.08.0/src/kmbox-15.08.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-            <Dependency>kcompletion-devel</Dependency>
-            <Dependency>ki18n-devel</Dependency>
-            <Dependency>boost-devel</Dependency>
-            <Dependency>kdoctools-devel</Dependency>
-            <Dependency>cmake</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>kmime-devel</Dependency>
+            <Dependency>boost-devel</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -30,37 +27,38 @@
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
             <Dependency>kmime</Dependency>
-            <Dependency>libgcc</Dependency>            
+            <Dependency>libgcc</Dependency>
         </RuntimeDependencies>
         <Files>
-	    <Path fileType="data">/usr/share</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
-            <Path fileType="doc">/usr/share/doc</Path>	    
+            <Path fileType="data">/usr/share</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
-    
+
     <Package>
         <Name>kmbox-devel</Name>
-	<Summary>Development files for kmbox</Summary>
+        <Summary>Development files for kmbox</Summary>
         <RuntimeDependencies>
-	    <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
             <Dependency release="current">kmbox</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="data">/usr/lib/cmake</Path>
-	    <Path fileType="config">/usr/lib/pkgconfig</Path>
+            <Path fileType="config">/usr/lib/pkgconfig</Path>
         </Files>
     </Package>
 
     <History>
         <Update release="1">
-            <Date>2015-08-22</Date>
+            <Date>2015-08-20</Date>
             <Version>15.08.0</Version>
             <Comment>First Release</Comment>
             <Name>Stefan Gronewold (groni)</Name>
             <Email>groni@pisilinux.org</Email>
-        </Update>     
+        </Update>
     </History>
 </PISI>