diff --git a/desktop/kde/plasma/kwin/pspec.xml b/desktop/kde/plasma/kwin/pspec.xml
index 361f505868..55bee9fbfb 100755
--- a/desktop/kde/plasma/kwin/pspec.xml
+++ b/desktop/kde/plasma/kwin/pspec.xml
@@ -15,131 +15,161 @@
         <Description>KWin is the window manager of the K desktop environment.</Description>
         <Archive sha1sum="721e7c348a273f4ea79e819992c7262f32844951" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/kwin-5.3.2.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency>qt5-base-devel</Dependency>
-            <Dependency>qt5-tools-devel</Dependency>
-            <Dependency>qt5-multimedia-devel</Dependency>
-            <Dependency>kwayland</Dependency>
+            <Dependency>kactivities-devel</Dependency>
+            <Dependency>kauth-devel</Dependency>
+            <Dependency>kcmutils-devel</Dependency>
+            <Dependency>kcompletion-devel</Dependency>
+            <Dependency>kconfig-devel</Dependency>
+            <Dependency>kconfigwidgets-devel</Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
+            <Dependency>kcrash-devel</Dependency>
+            <Dependency>kdeclarative-devel</Dependency>
             <Dependency>kdecorations-devel</Dependency>
-	    <Dependency>qt5-script-devel</Dependency>
-	    <Dependency>qt5-x11extras-devel</Dependency>
-	    <Dependency>qt5-declarative-devel</Dependency>
-	    <Dependency>kiconthemes-devel</Dependency>
-	    <Dependency>kauth-devel</Dependency>
-	    <Dependency>libXxf86vm-devel</Dependency>
-	    <Dependency>libXext-devel</Dependency>
-	    <Dependency>kactivities-devel</Dependency>
-	    <Dependency>kcmutils-devel</Dependency>
-	    <Dependency>kcompletion-devel</Dependency>
-	    <Dependency>kconfig-devel</Dependency>
-	    <Dependency>kconfigwidgets-devel</Dependency>
-	    <Dependency>kcoreaddons-devel</Dependency>
-	    <Dependency>kcrash-devel</Dependency>
-	    <Dependency>kdeclarative-devel</Dependency>
-	    <Dependency>kdoctools-devel</Dependency>
-	    <Dependency>kglobalaccel-devel</Dependency>
-	    <Dependency>ki18n-devel</Dependency>	
-	    <Dependency>kinit</Dependency>	
-	    <Dependency>kio-devel</Dependency>	
-	    <Dependency>knewstuff-devel</Dependency>	
-	    <Dependency>knotifications-devel</Dependency>	
-	    <Dependency>kservice-devel</Dependency>	
-	    <Dependency>kwidgetsaddons-devel</Dependency>	
-	    <Dependency>kwindowsystem-devel</Dependency>	
-	    <Dependency>kxmlgui-devel</Dependency>	    	
-	    <Dependency>plasma-framework-devel</Dependency>	
-	    <Dependency>mesa-devel</Dependency>
-	    <Dependency>libICE-devel</Dependency>
-	    <Dependency>libSM-devel</Dependency>
-	    <Dependency>wayland-devel</Dependency>
-	    <Dependency>wayland-client</Dependency>	    
-	    <Dependency>wayland-cursor</Dependency>
-	    <Dependency>libxkbcommon-devel</Dependency>
-	    <Dependency>xcb-util-keysyms-devel</Dependency>
-	    <Dependency>xcb-util-image-devel</Dependency>
-	    <Dependency>libXcursor-devel</Dependency>
-	    <Dependency>libepoxy-devel</Dependency>
-        <Dependency>libgcc</Dependency>
-        <Dependency>libX11-devel</Dependency>
-        <Dependency>libxcb-devel</Dependency>    
+            <Dependency>kdoctools-devel</Dependency>
+            <Dependency>kglobalaccel-devel</Dependency>
+            <Dependency>ki18n-devel</Dependency>
+            <Dependency>kiconthemes-devel</Dependency>
+            <Dependency>kinit-devel</Dependency>
+            <Dependency>kio-devel</Dependency>
+            <Dependency>knewstuff-devel</Dependency>
+            <Dependency>knotifications-devel</Dependency>
+            <Dependency>kservice-devel</Dependency>
+            <Dependency>kwayland-devel</Dependency>
+            <Dependency>kwidgetsaddons-devel</Dependency>
+            <Dependency>kwindowsystem-devel</Dependency>
+            <Dependency>kxmlgui-devel</Dependency>          
+            <Dependency>libepoxy-devel</Dependency>
+            <Dependency>libICE-devel</Dependency>
+            <Dependency>libSM-devel</Dependency>
+            <Dependency>libX11-devel</Dependency>
+            <Dependency>libxcb-devel</Dependency> 
+            <Dependency>libXcursor-devel</Dependency>
+            <Dependency>libXext-devel</Dependency>
+            <Dependency>libxkbcommon-devel</Dependency>
+            <Dependency>libXxf86vm-devel</Dependency>
+            <Dependency>mesa-devel</Dependency>
+            <Dependency>plasma-framework-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-declarative-devel</Dependency>
+            <Dependency>qt5-multimedia-devel</Dependency>
+            <Dependency>qt5-script-devel</Dependency>
+            <Dependency>qt5-tools-devel</Dependency>
+            <Dependency>qt5-x11extras-devel</Dependency>
+            <Dependency>wayland-client</Dependency>         
+            <Dependency>wayland-cursor</Dependency>
+            <Dependency>wayland-devel</Dependency>
+            <Dependency>xcb-util-image-devel</Dependency>
+            <Dependency>xcb-util-keysyms-devel</Dependency>
+            <Dependency>docbook-xsl</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>kwin</Name>
         <RuntimeDependencies>
-        <Dependency>qt5-base</Dependency>
-        <Dependency>libgcc</Dependency>
-        <Dependency>libX11</Dependency>
-        <Dependency>libxcb</Dependency> 
-        <Dependency>qt5-script</Dependency>+
-        <Dependency>kwayland</Dependency>+
-        <Dependency>kdecorations</Dependency>+
-	    <Dependency>qt5-x11extras</Dependency>+
-	    <Dependency>qt5-declarative</Dependency>+
-	    <Dependency>kiconthemes</Dependency>+
-	    <Dependency>kauth</Dependency>+
-	    <Dependency>kactivities</Dependency>+
-	    <Dependency>kcmutils</Dependency>+
-	    <Dependency>kcompletion</Dependency>+
-	    <Dependency>kconfig</Dependency>+
-	    <Dependency>kconfigwidgets</Dependency>+
-	    <Dependency>kcoreaddons</Dependency>+
-	    <Dependency>kcrash</Dependency>+
-	    <Dependency>kdeclarative</Dependency>+
-	    <Dependency>kglobalaccel</Dependency>+
-	    <Dependency>ki18n</Dependency>+	
-	    <Dependency>kio</Dependency>+	
-	    <Dependency>knewstuff</Dependency>+	
-	    <Dependency>knotifications</Dependency>+	
-	    <Dependency>kservice</Dependency>+	
-	    <Dependency>kwidgetsaddons</Dependency>+	
-	    <Dependency>kwindowsystem</Dependency>+	
-	    <Dependency>kxmlgui</Dependency>+	    	
-	    <Dependency>plasma-framework</Dependency>+	
-	    <Dependency>mesa</Dependency>+
-	    <Dependency>libICE</Dependency>+
-	    <Dependency>libSM</Dependency>+
-	    <Dependency>wayland-cursor</Dependency>+
-	    <Dependency>libxkbcommon</Dependency>+
-	    <Dependency>xcb-util-keysyms</Dependency>+
-	    <Dependency>xcb-util-image</Dependency>+
-	    <Dependency>libepoxy</Dependency>+
+            <Dependency>kactivities</Dependency>
+            <Dependency>kauth</Dependency>
+            <Dependency>kcmutils</Dependency>
+            <Dependency>kcompletion</Dependency>
+            <Dependency>kconfig</Dependency>
+            <Dependency>kconfigwidgets</Dependency>
+            <Dependency>kcoreaddons</Dependency>
+            <Dependency>kcrash</Dependency>
+            <Dependency>kdeclarative</Dependency>
+            <Dependency>kdecorations</Dependency>
+            <Dependency>kglobalaccel</Dependency>
+            <Dependency>ki18n</Dependency>
+            <Dependency>kiconthemes</Dependency>
+            <Dependency>kio</Dependency>
+            <Dependency>knewstuff</Dependency>
+            <Dependency>knotifications</Dependency>
+            <Dependency>kservice</Dependency>
+            <Dependency>kwayland</Dependency>
+            <Dependency>kwidgetsaddons</Dependency>
+            <Dependency>kwindowsystem</Dependency>
+            <Dependency>kxmlgui</Dependency>
+            <Dependency>libepoxy</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>libICE</Dependency>
+            <Dependency>libSM</Dependency>
+            <Dependency>libX11</Dependency>
+            <Dependency>libxcb</Dependency> 
+            <Dependency>libxkbcommon</Dependency>
+            <Dependency>mesa</Dependency>
+            <Dependency>plasma-framework</Dependency>
+            <Dependency>qt5-base</Dependency>
+            <Dependency>qt5-declarative</Dependency>
+            <Dependency>qt5-script</Dependency>
+            <Dependency>qt5-x11extras</Dependency>
+            <Dependency>wayland-cursor</Dependency>
+            <Dependency>wayland-client</Dependency>
+            <Dependency>xcb-util-image</Dependency>
+            <Dependency>xcb-util-keysyms</Dependency>
         </RuntimeDependencies>
         <Files>
-	    <Path fileType="config">/etc</Path>
+            <Path fileType="config">/etc</Path>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="localedata">/usr/share/locale</Path>
-	    <Path fileType="executable">/usr/bin</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
-        <Replaces>
-          <Package>kde-workspace</Package>
-        </Replaces>
-        <Conflicts>
-          <Package>kde-workspace</Package>
-        </Conflicts>  
     </Package>
     
     <Package>
         <Name>kwin-devel</Name>
-	<Summary>Development files for kwin</Summary>
+        <Summary>Development files for kwin</Summary>
         <RuntimeDependencies>
-	    <Dependency>qt5-base-devel</Dependency>
             <Dependency release="current">kwin</Dependency>
+            <Dependency>kactivities-devel</Dependency>
+            <Dependency>kauth-devel</Dependency>
+            <Dependency>kcmutils-devel</Dependency>
+            <Dependency>kcompletion-devel</Dependency>
+            <Dependency>kconfig-devel</Dependency>
+            <Dependency>kconfigwidgets-devel</Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
+            <Dependency>kcrash-devel</Dependency>
+            <Dependency>kdeclarative-devel</Dependency>
+            <Dependency>kdecorations-devel</Dependency>
+            <Dependency>kglobalaccel-devel</Dependency>
+            <Dependency>ki18n-devel</Dependency>
+            <Dependency>kiconthemes-devel</Dependency>
+            <Dependency>kinit-devel</Dependency>
+            <Dependency>kio-devel</Dependency>
+            <Dependency>knewstuff-devel</Dependency>
+            <Dependency>knotifications-devel</Dependency>
+            <Dependency>kservice-devel</Dependency>
+            <Dependency>kwayland-devel</Dependency>
+            <Dependency>kwidgetsaddons-devel</Dependency>
+            <Dependency>kwindowsystem-devel</Dependency>
+            <Dependency>kxmlgui-devel</Dependency>          
+            <Dependency>libepoxy-devel</Dependency>
+            <Dependency>libICE-devel</Dependency>
+            <Dependency>libSM-devel</Dependency>
+            <Dependency>libX11-devel</Dependency>
+            <Dependency>libxcb-devel</Dependency> 
+            <Dependency>libXcursor-devel</Dependency>
+            <Dependency>libXext-devel</Dependency>
+            <Dependency>libxkbcommon-devel</Dependency>
+            <Dependency>libXxf86vm-devel</Dependency>
+            <Dependency>mesa-devel</Dependency>
+            <Dependency>plasma-framework-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-declarative-devel</Dependency>
+            <Dependency>qt5-script-devel</Dependency>
+            <Dependency>qt5-x11extras-devel</Dependency>
+            <Dependency>wayland-devel</Dependency>
+            <Dependency>xcb-util-image-devel</Dependency>
+            <Dependency>xcb-util-keysyms-devel</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>                
-        <Replaces>
-          <Package>kde-workspace-devel</Package>
-        </Replaces>
-        <Conflicts>
-          <Package>kde-workspace-devel</Package>
-        </Conflicts> 
     </Package>
 
     <History>