diff --git a/desktop/kde/plasma/ksysguard/pspec.xml b/desktop/kde/plasma/ksysguard/pspec.xml
index c3ee727ed7..ca763422dd 100644
--- a/desktop/kde/plasma/ksysguard/pspec.xml
+++ b/desktop/kde/plasma/ksysguard/pspec.xml
@@ -31,18 +31,17 @@
             <Dependency>kwidgetsaddons-devel</Dependency>
             <Dependency>kwindowsystem-devel</Dependency>
             <Dependency>kxmlgui-devel</Dependency>
-            <Dependency release="current">libksysguard-devel</Dependency>
-	    <Dependency>kdesignerplugin</Dependency>
-	    <Dependency>kemoticons-devel</Dependency>
-	    <Dependency>kitemmodels-devel</Dependency>
-	    <Dependency>kinit-devel</Dependency>
-	    <Dependency>kunitconversion-devel</Dependency>
+            <Dependency versionFrom="5.4.0">libksysguard-devel</Dependency>
+            <Dependency>kdesignerplugin</Dependency>
+            <Dependency>kemoticons-devel</Dependency>
+            <Dependency>kitemmodels-devel</Dependency>
+            <Dependency>kinit-devel</Dependency>
+            <Dependency>kunitconversion-devel</Dependency>
             <Dependency>lm_sensors-devel</Dependency><!--1-->
             <Dependency>plasma-framework-devel</Dependency>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>docbook-xsl</Dependency>
+            <Dependency>docbook-xsl</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>cmake</Dependency>
         </BuildDependencies>
         <Patches>
         <!--<Patch level="1">0001-Use-run-for-ksysguardd-s-pid-file.patch</Patch> -->
@@ -52,7 +51,7 @@
     <Package>
         <Name>ksysguard</Name>
         <RuntimeDependencies>
-	  <Dependency>icon-theme-hicolor</Dependency><!--2-->
+            <Dependency>icon-theme-hicolor</Dependency><!--2-->
             <Dependency>kcompletion</Dependency>
             <Dependency>kconfig</Dependency>
             <Dependency>kconfigwidgets</Dependency>
diff --git a/desktop/kde/plasma/milou/pspec.xml b/desktop/kde/plasma/milou/pspec.xml
index 203fd0fb21..d803b1aea7 100644
--- a/desktop/kde/plasma/milou/pspec.xml
+++ b/desktop/kde/plasma/milou/pspec.xml
@@ -17,15 +17,15 @@
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>qt5-declarative</Dependency>
-	        <Dependency>kdoctools-devel</Dependency>
-	        <Dependency>kdeclarative-devel</Dependency>
-	        <Dependency>ki18n-devel</Dependency>
-	        <Dependency>krunner-devel</Dependency>
-	        <Dependency>plasma-framework-devel</Dependency>
-	        <Dependency>kconfig-devel</Dependency>
-	        <Dependency>kservice-devel</Dependency>
-	        <Dependency>kcoreaddons-devel</Dependency>
-	        <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>kdoctools-devel</Dependency>
+            <Dependency>kdeclarative-devel</Dependency>
+            <Dependency>ki18n-devel</Dependency>
+            <Dependency>krunner-devel</Dependency>
+            <Dependency>plasma-framework-devel</Dependency>
+            <Dependency>kconfig-devel</Dependency>
+            <Dependency>kservice-devel</Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
         </BuildDependencies>
     </Source>
 
diff --git a/desktop/kde/plasma/oxygen/pspec.xml b/desktop/kde/plasma/oxygen/pspec.xml
index 79863b044d..91d7950784 100644
--- a/desktop/kde/plasma/oxygen/pspec.xml
+++ b/desktop/kde/plasma/oxygen/pspec.xml
@@ -10,16 +10,16 @@
         <Summary>KDE Oxygen style</Summary>
         <Description>KDE Oxygen style</Description>
         <BuildDependencies>
-            <Dependency>cmake</Dependency>
+            <Dependency>kcmutils-devel</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
-	    <Dependency>frameworkintegration-devel</Dependency>kdoctools
-	    <Dependency>kdoctools-devel</Dependency>
-	    <Dependency>cairo-devel</Dependency>libxcb-devel
-	    <Dependency>libxcb-devel</Dependency>
-	    <Dependency>gtk3-devel</Dependency>
-	    <Dependency>kdoctools-devel</Dependency>
-	    <Dependency>kdecorations-devel</Dependency>
-	    <Dependency>plasma-workspace-devel</Dependency>
+            <Dependency>frameworkintegration-devel</Dependency>kdoctools
+            <Dependency>kdoctools-devel</Dependency>
+            <Dependency>cairo-devel</Dependency>libxcb-devel
+            <Dependency>libxcb-devel</Dependency>
+            <Dependency>gtk3-devel</Dependency>
+            <Dependency>kdoctools-devel</Dependency>
+            <Dependency>kdecorations-devel</Dependency>
+            <Dependency>plasma-workspace-devel</Dependency>
         </BuildDependencies>
         <Archive sha1sum="6ae81e41d1ae553846d7bc4ed029948503fe11c6" type="tarxz">http://download.kde.org/stable/plasma/5.4.0/oxygen-5.4.0.tar.xz</Archive>
     </Source>
@@ -27,19 +27,20 @@
         <Name>oxygen</Name>
         <RuntimeDependencies>
             <Dependency>ki18n</Dependency>
-	    <Dependency>libgcc</Dependency>
-	    <Dependency>libxcb</Dependency>
-	    <Dependency>kconfig</Dependency>
-	    <Dependency>qt5-base</Dependency>
-	    <Dependency>kguiaddons</Dependency>
-	    <Dependency>kcompletion</Dependency>
-	    <Dependency>kcoreaddons</Dependency>
-	    <Dependency>kdecorations</Dependency>
-	    <Dependency>kwindowsystem</Dependency>
-	    <Dependency>qt5-x11extras</Dependency>
-	    <Dependency>kconfigwidgets</Dependency>
-	    <Dependency>kwidgetsaddons</Dependency>
-	    <Dependency>frameworkintegration</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>libxcb</Dependency>
+            <Dependency>kconfig</Dependency>
+            <Dependency>qt5-base</Dependency>
+            <Dependency>kguiaddons</Dependency>
+            <Dependency>kcompletion</Dependency>
+            <Dependency>kcoreaddons</Dependency>
+            <Dependency>kdecorations</Dependency>
+            <Dependency>kwindowsystem</Dependency>
+            <Dependency>qt5-x11extras</Dependency>
+            <Dependency>kconfigwidgets</Dependency>
+            <Dependency>kwidgetsaddons</Dependency>
+            <Dependency>frameworkintegration</Dependency>
+            <Dependency>kcmutils</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/</Path>
diff --git a/desktop/kde/plasma/plasma-workspace/pspec.xml b/desktop/kde/plasma/plasma-workspace/pspec.xml
index 3fbb81980a..330b1c558f 100644
--- a/desktop/kde/plasma/plasma-workspace/pspec.xml
+++ b/desktop/kde/plasma/plasma-workspace/pspec.xml
@@ -10,8 +10,8 @@
         </Packager>
         <License>LGPLv2</License>
         <IsA>library</IsA>
-	    <IsA>app:console</IsA>
-	    <IsA>app:gui</IsA>
+        <IsA>app:console</IsA>
+        <IsA>app:gui</IsA>
         <Summary>The KDE5 Plasma Workspace Components</Summary>
         <Description>The KDE5 Plasma Workspace Components</Description>
         <Archive sha1sum="da4142a10a0a5b067149c0abc4a258b95d27edcd" type="tarxz">http://download.kde.org/stable/plasma/5.4.0/plasma-workspace-5.4.0.tar.xz</Archive>
@@ -34,13 +34,12 @@
             <Dependency>krunner-devel</Dependency>
             <Dependency>ktexteditor-devel</Dependency>
             <Dependency>kunitconversion-devel</Dependency>
-            <Dependency>kwayland-devel</Dependency>
-            <Dependency>kwin-devel</Dependency>
+            <Dependency versionFrom="5.4.0">kwayland-devel</Dependency>
+            <Dependency versionFrom="5.4.0">kwin-devel</Dependency>
             <Dependency>kxmlrpcclient-devel</Dependency>
             <Dependency>libdbusmenu-qt-devel</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>libkscreen-devel</Dependency>
-            <Dependency>libksysguard-devel</Dependency>
+            <Dependency versionFrom="5.4.0">libkscreen-devel</Dependency>
+            <Dependency versionFrom="5.4.0">libksysguard-devel</Dependency>
             <Dependency>libqalculate-devel</Dependency>
             <Dependency>libX11-devel</Dependency>
             <Dependency>libXau-devel</Dependency>
@@ -51,9 +50,9 @@
             <Dependency>NetworkManager-devel</Dependency>
             <Dependency>networkmanager-qt-devel</Dependency>
             <Dependency>pam-devel</Dependency>
-            <!--Dependency>prison-qt5-devel</Dependency-->
+            <Dependency>prison-qt5-devel</Dependency>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>xorg-app-devel</Dependency>
+            <Dependency>xorg-app-devel</Dependency>
             <Dependency>qt5-sql-mysql</Dependency> 
             <Dependency>qt5-sql-odbc</Dependency>
             <Dependency>qt5-sql-postgresql</Dependency>
@@ -65,7 +64,6 @@
             <Dependency>zlib-devel</Dependency>
             <Dependency>docbook-xsl</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -128,6 +126,7 @@
             <Dependency>libXrender</Dependency>
             <Dependency>networkmanager-qt</Dependency>
             <Dependency>pam</Dependency>
+            <Dependency>prison-qt5</Dependency>
             <Dependency>plasma-framework</Dependency>
             <Dependency>qt5-base</Dependency>    
             <Dependency>qt5-declarative</Dependency>     
diff --git a/desktop/kde/plasma/powerdevil/pspec.xml b/desktop/kde/plasma/powerdevil/pspec.xml
index d5e0d528ac..54d9dd3cf8 100644
--- a/desktop/kde/plasma/powerdevil/pspec.xml
+++ b/desktop/kde/plasma/powerdevil/pspec.xml
@@ -22,13 +22,12 @@
             <Dependency>eudev-devel</Dependency>
             <Dependency>kdesignerplugin</Dependency>
             <Dependency>kinit-devel</Dependency>
-	    <Dependency>kunitconversion-devel</Dependency>
-	    <Dependency>kitemmodels-devel</Dependency>
-	    <Dependency>kemoticons-devel</Dependency>
-	    <Dependency>docbook-xsl</Dependency>
-	    <Dependency>plasma-workspace-devel</Dependency>
+            <Dependency>kunitconversion-devel</Dependency>
+            <Dependency>kitemmodels-devel</Dependency>
+            <Dependency>kemoticons-devel</Dependency>
+            <Dependency>docbook-xsl</Dependency>
+            <Dependency versionFrom="5.4.0">plasma-workspace-devel</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>