diff --git a/desktop/kde/applications/kfind/actions.py b/desktop/kde/applications/kfind/actions.py
index b3d60d7dc9..adc19a13cd 100644
--- a/desktop/kde/applications/kfind/actions.py
+++ b/desktop/kde/applications/kfind/actions.py
@@ -4,8 +4,6 @@
 # See the file http://www.gnu.org/copyleft/gpl.txt
 
 from pisi.actionsapi import kde5
-from pisi.actionsapi import pisitools
-
 
 
 def setup():
@@ -16,6 +14,3 @@ def build():
 
 def install():
     kde5.install()
-
-
-    #pisitools.dodoc("AUTHORS", "BUGS", "ChangeLog", "COPYING", "README")
diff --git a/desktop/kde/applications/kfind/pspec.xml b/desktop/kde/applications/kfind/pspec.xml
index 8b14ba8599..a45d2a231f 100644
--- a/desktop/kde/applications/kfind/pspec.xml
+++ b/desktop/kde/applications/kfind/pspec.xml
@@ -1,42 +1,44 @@
-<?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>kfind</Name>
-        <Homepage>https://www.kde.org/applications/utilities/kfind/</Homepage>
+        <Homepage>http://kde.org/applications/utilities/kfind/</Homepage>
         <Packager>
             <Name>Stefan Gronewold</Name>
             <Email>groni@pisilinux.org</Email>
         </Packager>
-        <License>LGPL</License>
-        <Summary>Search and Replace Tool</Summary>
-        <Description>KFind can be used as a standalone search tool, launched by KRunner or from your menu. It is also integrated into Konqueror as "Find File" in the "Tools" menu. It allows you to find files by name, type or content.</Description>
-        <Archive sha1sum="adb1a234b4a44de7267592c6f5c565944d77aa5b" type="tarxz">http://download.kde.org/stable/applications/16.12.0/src/kfind-16.12.0.tar.xz</Archive>
+        <License>GPLv2</License>
+        <PartOf>desktop.enlightenment</PartOf>
+        <Summary>Find Files/Folders</Summary>
+        <Description>Find Files/Folders</Description>
         <BuildDependencies>
             <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>kdelibs4-support-devel</Dependency>
+            <Dependency>gettext-devel</Dependency>
+            <Dependency>glibc-devel</Dependency>
+            <Dependency>karchive-devel</Dependency>
             <Dependency>kdesignerplugin</Dependency>
-            <Dependency>kdoctools-devel</Dependency>
-            <Dependency>qt5-base-devel</Dependency>
             <Dependency>kemoticons-devel</Dependency>
             <Dependency>kitemmodels-devel</Dependency>
             <Dependency>kinit-devel</Dependency>
             <Dependency>kunitconversion-devel</Dependency>
-        </BuildDependencies>        
+            <Dependency>kdelibs4-support-devel</Dependency>
+            <Dependency>kdoctools-devel</Dependency>
+            <Dependency>python-devel</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
+        </BuildDependencies>
+        <Archive sha1sum="adb1a234b4a44de7267592c6f5c565944d77aa5b" type="tarxz">mirrors://kde/stable/applications/16.12.0/src/kfind-16.12.0.tar.xz</Archive>
     </Source>
-    
     <Package>
         <Name>kfind</Name>
         <Summary>Find Files/Folders</Summary>
         <RuntimeDependencies>
-            <Dependency>qt5-base</Dependency>
+            <Dependency>karchive</Dependency>
             <Dependency>kdelibs4-support</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-base</Dependency>
             <Dependency>kio</Dependency>
             <Dependency>ki18n</Dependency>
-            <Dependency>libgcc</Dependency>
             <Dependency>kconfig</Dependency>
             <Dependency>kxmlgui</Dependency>
-            <Dependency>karchive</Dependency>
             <Dependency>kservice</Dependency>
             <Dependency>kcompletion</Dependency>
             <Dependency>kcoreaddons</Dependency>
@@ -44,17 +46,37 @@
             <Dependency>kconfigwidgets</Dependency>
             <Dependency>kwidgetsaddons</Dependency>
         </RuntimeDependencies>
+        <Replaces>
+          <Package>kde-baseapps</Package>
+        </Replaces>
+        <Conflicts>
+          <Package>kde-baseapps</Package>
+        </Conflicts>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="data">/usr/share</Path>
             <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="man">/usr/share/man/man1</Path>
         </Files>
     </Package>
-    
     <History>
-        <Update release="1">
-            <Date>2016-12-31</Date>
+        <Update release="3">
+            <Date>2017-03-03</Date>
             <Version>16.12.0</Version>
+            <Comment>Rebuild for new Toolchain.</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
+        <Update release="2">
+            <Date>2016-12-22</Date>
+            <Version>16.12.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
+        <Update release="1">
+            <Date>2016-12-03</Date>
+            <Version>16.11.90</Version>
             <Comment>First Release</Comment>
             <Name>Stefan Gronewold</Name>
             <Email>groni@pisilinux.org</Email>
diff --git a/desktop/kde/applications/kio-extras/pspec.xml b/desktop/kde/applications/kio-extras/pspec.xml
index 5fa65fc28c..d8f0dc9966 100644
--- a/desktop/kde/applications/kio-extras/pspec.xml
+++ b/desktop/kde/applications/kio-extras/pspec.xml
@@ -37,13 +37,13 @@
             <Dependency>libjpeg-turbo-devel</Dependency>
             <Dependency>libmtp-devel</Dependency>
             <Dependency>libssh-devel</Dependency>
-            <Dependency>qt5-base-devel</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
             <Dependency>qt5-phonon-devel</Dependency>
-            <Dependency>qt5-svg-devel</Dependency>
-            <Dependency>qt5-sql-mysql</Dependency>
-            <Dependency>qt5-sql-odbc</Dependency>
-            <Dependency>qt5-sql-postgresql</Dependency>
-            <Dependency>qt5-sql-sqlite</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-svg-devel</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-sql-mysql</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-sql-odbc</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-sql-postgresql</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-sql-sqlite</Dependency>
             <Dependency>samba-devel</Dependency>
             <Dependency>shared-mime-info</Dependency>
             <Dependency>solid-devel</Dependency>
@@ -72,10 +72,10 @@
             <Dependency>kguiaddons</Dependency>
             <Dependency>khtml</Dependency>
             <Dependency>ki18n</Dependency>
-            <Dependency>qt5-sql-mysql</Dependency>
-            <Dependency>qt5-sql-odbc</Dependency>
-            <Dependency>qt5-sql-postgresql</Dependency>
-            <Dependency>qt5-sql-sqlite</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-sql-mysql</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-sql-odbc</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-sql-postgresql</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-sql-sqlite</Dependency>
             <Dependency>kiconthemes</Dependency>
             <Dependency>kio</Dependency>
             <Dependency>kparts</Dependency>
@@ -89,7 +89,7 @@
             <Dependency>libssh</Dependency>
             <Dependency>qt5-base</Dependency>
             <Dependency>qt5-phonon</Dependency>
-            <Dependency>qt5-svg</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-svg</Dependency>
             <Dependency>samba</Dependency>
             <Dependency>solid</Dependency>
             <Dependency>openslp</Dependency>
@@ -107,6 +107,13 @@
     </Package>
 
     <History>
+        <Update release="8">
+            <Date>2017-03-03</Date>
+            <Version>16.12.0</Version>
+            <Comment>Rebuild for new Toolchain.</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
         <Update release="7">
             <Date>2016-12-23</Date>
             <Version>16.12.0</Version>
diff --git a/desktop/kde/applications/konqueror/actions.py b/desktop/kde/applications/konqueror/actions.py
index bf43c3f80c..bfc1ccbcb4 100644
--- a/desktop/kde/applications/konqueror/actions.py
+++ b/desktop/kde/applications/konqueror/actions.py
@@ -16,6 +16,5 @@ def build():
 def install():
     kde5.install()
 
-
     pisitools.dodoc("AUTHORS", "ChangeLog")
 
diff --git a/desktop/kde/applications/konqueror/pspec.xml b/desktop/kde/applications/konqueror/pspec.xml
index c05cc29f44..815328dcbf 100644
--- a/desktop/kde/applications/konqueror/pspec.xml
+++ b/desktop/kde/applications/konqueror/pspec.xml
@@ -3,85 +3,101 @@
 <PISI>
     <Source>
         <Name>konqueror</Name>
-        <Homepage>https://community.kde.org/KDE_PIM</Homepage>
+        <Homepage>https://www.kde.org/applications/internet/konqueror/</Homepage>
         <Packager>
             <Name>Stefan Gronewold</Name>
             <Email>groni@pisilinux.org</Email>
         </Packager>
-        <License>GPLv2</License>
-        <Summary>KDE File Manager and Web Browser</Summary>
-        <Description>KDE File Manager and Web Browser.</Description>
-        <Archive sha1sum="8e97898491b29ab8db1fd7246fd3b51d7325a4fa" type="tarxz">mirrors://kde/stable/applications/16.12.0/src/konqueror-16.12.0.tar.xz</Archive>
+        <License>FDL</License>
+        <License>GPL</License>
+        <License>LGPL</License>
+        <Summary>Konqueror - KDE File Manager and Web Browser</Summary>
+        <Description>Konqueror is KDE's Webbrowser and swiss-army-knife for any kind of file-management and file previewing.</Description>
+        <Archive type="tarxz" sha1sum="8e97898491b29ab8db1fd7246fd3b51d7325a4fa">mirrors://kde/stable/applications/16.12.0/src/konqueror-16.12.0.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency>kparts-devel</Dependency>
-            <Dependency>khtml-devel</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>kcmutils-devel</Dependency>
-            <Dependency>libX11-devel</Dependency>
-            <Dependency>kdoctools-devel</Dependency>
-            <Dependency>karchive-devel</Dependency>
-            <Dependency>kcrash-devel</Dependency>
-            <Dependency>python</Dependency>
+            <Dependency>gettext-devel</Dependency>
+            <Dependency>glibc-devel</Dependency>
             <Dependency>kactivities-devel</Dependency>
-            <Dependency>kdoctools-devel</Dependency>
-            <Dependency>libXext-devel</Dependency>
+            <Dependency>karchive-devel</Dependency>
             <Dependency>kbookmarks-devel</Dependency>
-            <Dependency>qt5-webengine-devel</Dependency>
-            <Dependency>qt5-script-devel</Dependency>
-            <Dependency>zlib-devel</Dependency>
+            <Dependency>kcmutils-devel</Dependency>
+            <Dependency>kcrash-devel</Dependency>
             <Dependency>kdelibs4-support-devel</Dependency>
-            <Dependency>qt5-x11extras-devel</Dependency>
-            <Dependency>kded-devel</Dependency>
-            <Dependency>qt5-webengine-devel</Dependency>
-            <Dependency>kinit-devel</Dependency> 
-            <Dependency>tidy-devel</Dependency>
-            <Dependency>kwidgetsaddons-devel</Dependency>
-            <Dependency>kiconthemes-devel</Dependency>
-            <Dependency>kio-devel</Dependency>
-            <Dependency>khtml-devel</Dependency>
             <Dependency>kdesu-devel</Dependency>
+            <Dependency>kdoctools-devel</Dependency>
+            <Dependency>khtml-devel</Dependency>
+            <Dependency>kiconthemes-devel</Dependency>
+            <Dependency>kinit-devel</Dependency>
+            <Dependency>kio-devel</Dependency>
+            <Dependency>kparts-devel</Dependency>
             <Dependency>kdesignerplugin</Dependency>
             <Dependency>kemoticons-devel</Dependency>
             <Dependency>kitemmodels-devel</Dependency>
             <Dependency>kunitconversion-devel</Dependency>
+            <Dependency>kwidgetsaddons-devel</Dependency>
+            <Dependency>libICE-devel</Dependency>
+            <Dependency>libX11-devel</Dependency>
+            <Dependency>libXext-devel</Dependency>
+            <Dependency>python-devel</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-declarative-devel</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-location-devel</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-webchannel-devel</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-webengine-devel</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-x11extras-devel</Dependency>
+            <Dependency>tidy-devel</Dependency>
+            <Dependency>zlib-devel</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>konqueror</Name>
-        <Summary>KDE File Manager and Web Browser</Summary>
+        <Summary>Konqueror - KDE File Manager and Web Browser</Summary>
         <RuntimeDependencies>
-            <Dependency>kio</Dependency>
-            <Dependency>zlib</Dependency>
+            <Dependency>karchive</Dependency>
+            <Dependency>kbookmarks</Dependency>
+            <Dependency>kcmutils</Dependency>
+            <Dependency>kcrash</Dependency>
+            <Dependency>kded</Dependency>
+            <Dependency>kdelibs4-support</Dependency>
             <Dependency>kdesu</Dependency>
             <Dependency>khtml</Dependency>
-            <Dependency>ki18n</Dependency>
+            <Dependency>kiconthemes</Dependency>
+            <Dependency>kinit</Dependency>
+            <Dependency>kio</Dependency>
             <Dependency>kparts</Dependency>
+            <Dependency>kwidgetsaddons</Dependency>
+            <Dependency>libX11</Dependency>
+            <Dependency>libXext</Dependency>
             <Dependency>libgcc</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-base</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-declarative</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-location</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-webchannel</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-webengine</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-x11extras</Dependency>
+            <Dependency>zlib</Dependency>
+            <Dependency>tidy</Dependency>
+            <Dependency>ki18n</Dependency>
             <Dependency>sonnet</Dependency>
             <Dependency>kcodecs</Dependency>
             <Dependency>kconfig</Dependency>
             <Dependency>kxmlgui</Dependency>
-            <Dependency>karchive</Dependency>
-            <Dependency>kcmutils</Dependency>
             <Dependency>kservice</Dependency>
-            <Dependency>qt5-base</Dependency>
-            <Dependency>kbookmarks</Dependency>
             <Dependency>kitemviews</Dependency>
-            <Dependency>qt5-script</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-script</Dependency>
             <Dependency>kcompletion</Dependency>
             <Dependency>kcoreaddons</Dependency>
             <Dependency>kdbusaddons</Dependency>
-            <Dependency>kiconthemes</Dependency>
             <Dependency>kjobwidgets</Dependency>
             <Dependency>ktextwidgets</Dependency>
             <Dependency>kwindowsystem</Dependency>
-            <Dependency>qt5-webengine</Dependency>
             <Dependency>kconfigwidgets</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-            <Dependency>kdelibs4-support</Dependency>
-            <Dependency>tidy</Dependency>
         </RuntimeDependencies>
+        <Replaces>
+          <Package>kde-baseapps</Package>
+        </Replaces>
         <Conflicts>
           <Package>kde-baseapps</Package>
         </Conflicts>
@@ -99,7 +115,7 @@
         <Name>konqueror-devel</Name>
         <Summary>Development files for konqueror</Summary>
         <RuntimeDependencies>
-            <Dependency>qt5-base-devel</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
             <Dependency release="current">konqueror</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -109,9 +125,23 @@
     </Package>
 
     <History>
-        <Update release="1">
-            <Date>2017-01-03</Date>
+        <Update release="3">
+            <Date>2017-03-03</Date>
             <Version>16.12.0</Version>
+            <Comment>Rebuild for new Toolchain.</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update> 
+        <Update release="2">
+            <Date>2016-12-25</Date>
+            <Version>16.12.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
+        <Update release="1">
+            <Date>2016-12-03</Date>
+            <Version>16.11.90</Version>
             <Comment>First Release</Comment>
             <Name>Stefan Gronewold</Name>
             <Email>groni@pisilinux.org</Email>
diff --git a/desktop/pisilinux/kaptan/pspec.xml b/desktop/pisilinux/kaptan/pspec.xml
index f2c269f36a..1ce6aae308 100644
--- a/desktop/pisilinux/kaptan/pspec.xml
+++ b/desktop/pisilinux/kaptan/pspec.xml
@@ -18,7 +18,7 @@
             <Dependency>python3-setuptools</Dependency>
             <Dependency>python3-qt5</Dependency>
             <Dependency>python3-devel</Dependency>
-            <Dependency>qt5-linguist</Dependency>
+            <Dependency versionFrom="5.7.1">qt5-linguist</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -40,6 +40,13 @@
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2017-03-03</Date>
+            <Version>5.0</Version>
+            <Comment>Rebuild for new Toolchain.</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
         <Update release="6">
             <Date>2016-08-09</Date>
             <Version>5.0</Version>
diff --git a/multimedia/misc/libkate/pspec.xml b/multimedia/misc/libkate/pspec.xml
index de636f7f7d..62d7106b16 100644
--- a/multimedia/misc/libkate/pspec.xml
+++ b/multimedia/misc/libkate/pspec.xml
@@ -62,6 +62,13 @@
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2017-03-03</Date>
+            <Version>0.4.1</Version>
+            <Comment>Rebuild for new Toolchain.</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update> 
         <Update release="2">
             <Date>2016-06-09</Date>
             <Version>0.4.1</Version>