diff --git a/desktop/kde/plasma/kinfocenter/pspec.xml b/desktop/kde/plasma/kinfocenter/pspec.xml
index 5e9460b6a9..6cee54e520 100644
--- a/desktop/kde/plasma/kinfocenter/pspec.xml
+++ b/desktop/kde/plasma/kinfocenter/pspec.xml
@@ -42,15 +42,11 @@
             <Dependency>kitemmodels-devel</Dependency>
             <Dependency>kinit-devel</Dependency>
             <Dependency>kunitconversion-devel</Dependency>
-            <Dependency>kwayland-devel</Dependency>
+            <Dependency versionFrom="5.4.0">kwayland-devel</Dependency>
             <Dependency>kdesignerplugin</Dependency>
             <Dependency>docbook-xsl</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>cmake</Dependency>
         </BuildDependencies>
-        <Patches>
-        <!--<Patch level="1">pisilinux-kinfocenter.diff</Patch> -->
-        </Patches>
     </Source>
 
     <Package>
diff --git a/desktop/kde/plasma/kwin/pspec.xml b/desktop/kde/plasma/kwin/pspec.xml
index 87f2a1bcee..ca49ccfa41 100644
--- a/desktop/kde/plasma/kwin/pspec.xml
+++ b/desktop/kde/plasma/kwin/pspec.xml
@@ -24,7 +24,7 @@
             <Dependency>kcoreaddons-devel</Dependency>
             <Dependency>kcrash-devel</Dependency>
             <Dependency>kdeclarative-devel</Dependency>
-            <Dependency>kdecorations-devel</Dependency>
+            <Dependency versionFrom="5.4.0">kdecorations-devel</Dependency>
             <Dependency>kdoctools-devel</Dependency>
             <Dependency>kglobalaccel-devel</Dependency>
             <Dependency>ki18n-devel</Dependency>
@@ -59,9 +59,13 @@
             <Dependency>wayland-devel</Dependency>
             <Dependency>xcb-util-image-devel</Dependency>
             <Dependency>xcb-util-keysyms-devel</Dependency>
+            <Dependency>eudev-devel</Dependency>
+            <Dependency>libinput-devel</Dependency>
+            <Dependency>xcb-util-cursor-devel</Dependency>
+            <Dependency>qt5-multimedia-devel</Dependency>
+            <Dependency>qt5-multimedia</Dependency>
             <Dependency>docbook-xsl</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -106,6 +110,11 @@
             <Dependency>wayland-client</Dependency>
             <Dependency>xcb-util-image</Dependency>
             <Dependency>xcb-util-keysyms</Dependency>
+            <Dependency>eudev</Dependency>
+            <Dependency>kpackage</Dependency>
+            <Dependency>libdrm</Dependency>
+            <Dependency>libinput</Dependency>
+            <Dependency>xcb-util-cursor</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
@@ -163,6 +172,10 @@
             <Dependency>wayland-devel</Dependency>
             <Dependency>xcb-util-image-devel</Dependency>
             <Dependency>xcb-util-keysyms-devel</Dependency>
+            <Dependency>eudev-devel</Dependency>
+            <Dependency>libinput-devel</Dependency>
+            <Dependency>xcb-util-cursor-devel</Dependency>
+            <Dependency>qt5-multimedia-devel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
diff --git a/desktop/kde/plasma/kwrited/pspec.xml b/desktop/kde/plasma/kwrited/pspec.xml
index 0ad923bb02..aaa4a0cffc 100644
--- a/desktop/kde/plasma/kwrited/pspec.xml
+++ b/desktop/kde/plasma/kwrited/pspec.xml
@@ -10,22 +10,20 @@
         </Packager>
         <License>LGPLv2</License>
         <IsA>library</IsA>
-	<IsA>app:console</IsA>
+        <IsA>app:console</IsA>
         <Summary>KDE5 daemon listening for wall and write messages</Summary>
         <Description>KDE5 daemon listening for wall and write messages</Description>
         <Archive sha1sum="590f07ec76f511506722b6f37773d6185752489a" type="tarxz">http://download.kde.org/stable/plasma/5.4.0/kwrited-5.4.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>ki18n-devel</Dependency>
-	    <Dependency>kdoctools-devel</Dependency>
-	    <Dependency>kcoreaddons-devel</Dependency>
-	    <Dependency>knotifications-devel</Dependency>
-	    <Dependency>kpty-devel</Dependency>
-            <Dependency>libgcc</Dependency>
-	    <Dependency>kdelibs4-support-devel</Dependency>
-	    <Dependency>kdbusaddons-devel</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>
-	    <Dependency>cmake</Dependency>
+            <Dependency>ki18n-devel</Dependency>
+            <Dependency>kdoctools-devel</Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
+            <Dependency>knotifications-devel</Dependency>
+            <Dependency>kpty-devel</Dependency>
+            <Dependency>kdelibs4-support-devel</Dependency>
+            <Dependency>kdbusaddons-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -33,42 +31,36 @@
         <Name>kwrited</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
-	    <Dependency>kpty</Dependency>
+            <Dependency>kpty</Dependency>
             <Dependency>libgcc</Dependency>
-	    <Dependency>kcoreaddons</Dependency>
-	    <Dependency>knotifications</Dependency>
-	    <Dependency>kdbusaddons</Dependency>
+            <Dependency>kcoreaddons</Dependency>
+            <Dependency>knotifications</Dependency>
+            <Dependency>kdbusaddons</Dependency>
         </RuntimeDependencies>
         <Files>
-	    <Path fileType="data">/usr/share</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</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>
-        <Replaces>
-          <Package>kde-workspace</Package>
-        </Replaces>
-        <Conflicts>
-          <Package>kde-workspace</Package>
-        </Conflicts>
     </Package>
 
     <History>
-        <Update release="6">
+        <Update release="3">
             <Date>2015-08-25</Date>
             <Version>5.4.0</Version>
             <Comment>Version bump.</Comment>
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>
         </Update>
-        <Update release="5">
+        <Update release="2">
             <Date>2015-07-03</Date>
             <Version>5.3.2</Version>
             <Comment>Version bump.</Comment>
             <Name>Stefan Gronewold(groni)</Name>
             <Email>groni@pisilinux.org</Email>
         </Update>
-        <Update release="4">
+        <Update release="1">
             <Date>2015-06-14</Date>
             <Version>5.3.1</Version>
             <Comment>Version bump.</Comment>
diff --git a/x11/library/xcb-util-cursor/actions.py b/x11/library/xcb-util-cursor/actions.py
new file mode 100644
index 0000000000..d10620b979
--- /dev/null
+++ b/x11/library/xcb-util-cursor/actions.py
@@ -0,0 +1,21 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import get
+
+def setup():
+    autotools.autoreconf("-vif")
+    autotools.configure("--disable-static \
+                         --with-pic")
+def build():
+    autotools.make()
+
+def install():
+    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+
+    pisitools.dodoc("README")
diff --git a/x11/library/xcb-util-cursor/pspec.xml b/x11/library/xcb-util-cursor/pspec.xml
new file mode 100644
index 0000000000..4c975c605f
--- /dev/null
+++ b/x11/library/xcb-util-cursor/pspec.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>xcb-util-cursor</Name>
+        <Homepage>http://xcb.freedesktop.org</Homepage>
+        <Packager>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Packager>
+        <License>MIT</License>
+        <IsA>library</IsA>
+        <Summary>XCB cursor library</Summary>
+        <Description>The xcb-util-image module provides a number of libraries which sit on top of libxcb, the core X protocol library, and some of the extension libraries.</Description>
+        <Archive sha1sum="b55a92cd96c3ec1be9a26963df6d5f16e68fffea" type="tarbz2">http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.2.tar.bz2</Archive>
+        <BuildDependencies>
+            <Dependency>util-macros</Dependency>
+            <Dependency>libxcb-devel</Dependency>
+            <Dependency>xcb-util-devel</Dependency>
+            <Dependency>xcb-util-image-devel</Dependency>
+            <Dependency>xcb-util-renderutil-devel</Dependency>
+        </BuildDependencies>
+    </Source>
+
+    <Package>
+        <Name>xcb-util-cursor</Name>
+        <RuntimeDependencies>
+            <Dependency>libxcb</Dependency>
+            <Dependency>xcb-util-image</Dependency>
+            <Dependency>xcb-util-renderutil</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>xcb-util-cursor-devel</Name>
+        <Summary>Development files for xcb-util</Summary>
+        <RuntimeDependencies>
+            <Dependency release="current">xcb-util-cursor</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="header">/usr/include</Path>
+            <Path fileType="data">/usr/lib/pkgconfig</Path>
+            <Path fileType="data">/usr/lib32/pkgconfig</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>xcb-util-cursor-32bit</Name>
+        <PartOf>emul32</PartOf>
+        <Summary>32-bit shared libraries for xcb-util</Summary>
+        <BuildType>emul32</BuildType>
+        <BuildDependencies>
+            <Dependency>libxcb-32bit</Dependency>
+            <Dependency>glibc-32bit</Dependency>
+            <Dependency>xcb-util-image-32bit</Dependency>
+            <Dependency>xcb-util-renderutil-32bit</Dependency>
+        </BuildDependencies>
+        <RuntimeDependencies>
+            <Dependency>glibc-32bit</Dependency>
+            <Dependency>libxcb-32bit</Dependency>
+            <Dependency>xcb-util-image-32bit</Dependency>
+            <Dependency>xcb-util-renderutil-32bit</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib32</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="1">
+            <Date>2015-08-26</Date>
+            <Version>0.1.2</Version>
+            <Comment>First release</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+    </History>
+</PISI>