diff --git a/desktop/kde/application/akonadi/pspec.xml b/desktop/kde/application/akonadi/pspec.xml
index 0b13048594..f5dff5748c 100644
--- a/desktop/kde/application/akonadi/pspec.xml
+++ b/desktop/kde/application/akonadi/pspec.xml
@@ -45,13 +45,12 @@
             <!--Dependency>boost</Dependency-->
         </RuntimeDependencies>
         <Files>
-            <Path fileType="config">/etc/akonadi</Path>
+            <Path fileType="config">/etc/xdg</Path>
             <Path fileType="executable">/usr/bin</Path>
             <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="data">/usr/share/kf5</Path>
             <Path fileType="doc">/usr/share/doc/</Path>
         </Files>
     </Package>
diff --git a/desktop/kde/application/kdepim-runtime/pspec.xml b/desktop/kde/application/kdepim-runtime/pspec.xml
index 44fc92399e..9e407f023e 100644
--- a/desktop/kde/application/kdepim-runtime/pspec.xml
+++ b/desktop/kde/application/kdepim-runtime/pspec.xml
@@ -20,6 +20,7 @@
             <Dependency>boost-devel</Dependency>
             <Dependency>shared-mime-info</Dependency>
             <Dependency>akonadi-devel</Dependency>
+	    <Dependency>akonadi-calendar-devel</Dependency>
             <Dependency>akonadi-search-devel</Dependency>
             <Dependency>kcmutils-devel</Dependency>
             <Dependency>kdelibs4-support-devel</Dependency>
diff --git a/desktop/kde/application/libkgapi/pspec.xml b/desktop/kde/application/libkgapi/pspec.xml
index d8f1b35389..28c4e3087d 100755
--- a/desktop/kde/application/libkgapi/pspec.xml
+++ b/desktop/kde/application/libkgapi/pspec.xml
@@ -17,7 +17,19 @@
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
-            <Dependency>kdoctools-devel</Dependency>            
+            <Dependency>kdelibs4-support-devel</Dependency>
+            <Dependency>kdesignerplugin</Dependency>
+            <Dependency>kemoticons-devel</Dependency>
+            <Dependency>kitemmodels-devel</Dependency>
+            <Dependency>kinit-devel</Dependency>
+            <Dependency>kunitconversion-devel</Dependency>
+            <Dependency>kcontacts-devel</Dependency>
+            <Dependency>kwindowsystem-devel</Dependency>
+            <Dependency>kio-devel</Dependency>
+            <Dependency>kcalcore-devel</Dependency>
+            <Dependency>kdoctools-devel</Dependency>
+            <Dependency>qt5-webkit-devel</Dependency>
+            <Dependency>qt5-linguist</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -47,6 +59,12 @@
 	<Summary>Development files for libkgapi</Summary>
         <RuntimeDependencies>
 	    <Dependency>qt5-base-devel</Dependency>
+            <Dependency>kcalcore-devel</Dependency>
+            <Dependency>kcontacts-devel</Dependency>
+            <Dependency>kio-devel</Dependency>
+            <Dependency>qt5-webkit-devel</Dependency>
+            <Dependency>kwindowsystem-devel</Dependency>
+            <Dependency>kdelibs4-support-devel</Dependency>
             <Dependency release="current">libkgapi</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -58,7 +76,7 @@
 
     <History>
         <Update release="1">
-            <Date>2015-08-24</Date>
+            <Date>2015-09-08</Date>
             <Version>5.0.0</Version>
             <Comment>First Release</Comment>
             <Name>Stefan Gronewold (groni)</Name>
diff --git a/desktop/toolkit/qscintilla2/pspec.xml b/desktop/toolkit/qscintilla2/pspec.xml
index 2aa21f3bbb..1937b4a580 100644
--- a/desktop/toolkit/qscintilla2/pspec.xml
+++ b/desktop/toolkit/qscintilla2/pspec.xml
@@ -14,10 +14,10 @@
         <BuildDependencies>
             <Dependency>python3-qt5</Dependency>
             <Dependency>python3-devel</Dependency>
-            <Dependency>python3-sip3</Dependency>
+            <Dependency>python3-sip</Dependency>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>qt5-designer-devel</Dependency>
-            <Dependency>sip3-devel</Dependency>
+            <Dependency>sip-devel</Dependency>
         </BuildDependencies>
         <Archive type="targz" sha1sum="de807f026ac47d4e9472836c73ab8b8039716c37">mirrors://sourceforge/pyqt/QScintilla2/QScintilla-2.9/QScintilla-gpl-2.9.tar.gz</Archive>
         <Patches>
@@ -68,7 +68,7 @@
             <Dependency>python3</Dependency>
             <Dependency version="current">qscintilla2</Dependency>
             <Dependency version="current">qscintilla2-python-common</Dependency>
-            <Dependency>qt-base</Dependency>
+            <Dependency>qt5-base</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib/python3*</Path>
diff --git a/programming/language/python/python-qt5/actions.py b/programming/language/python/python-qt5/actions.py
index 756778ad62..d7cc3734ac 100644
--- a/programming/language/python/python-qt5/actions.py
+++ b/programming/language/python/python-qt5/actions.py
@@ -17,7 +17,7 @@ def setup():
                                      --assume-shared \
                                      --no-timestamp \
                                      --qsci-api \
-                                     --sip /usr/bin/sip3 \
+                                     --sip /usr/bin/sip \
                                      --qmake='/usr/lib/qt5/bin/qmake' \
                                      --destdir='/usr/lib/python3.4/site-packages/' \
                                      --sip-incdir='/usr/include/python3.4m' \
diff --git a/programming/language/python/python-qt5/pspec.xml b/programming/language/python/python-qt5/pspec.xml
index abc06723fa..9cf891e27f 100644
--- a/programming/language/python/python-qt5/pspec.xml
+++ b/programming/language/python/python-qt5/pspec.xml
@@ -16,7 +16,7 @@
             <Dependency>dbus-python3</Dependency>
             <Dependency>dbus-python-common</Dependency>
             <Dependency>python3-devel</Dependency>
-            <Dependency versionFrom="4.16.6">python3-sip3</Dependency>
+            <Dependency versionFrom="4.16.6">python3-sip</Dependency>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>qt5-connectivity-devel</Dependency>
             <Dependency>qt5-declarative-devel</Dependency>
@@ -31,11 +31,11 @@
             <Dependency>qt5-websockets-devel</Dependency>
             <Dependency>qt5-x11extras-devel</Dependency>
             <Dependency>qt5-xmlpatterns-devel</Dependency>
-            <Dependency versionFrom="4.16.6">sip3-devel</Dependency>
+            <Dependency versionFrom="4.16.6">sip-devel</Dependency>
         </BuildDependencies>
         <Archive sha1sum="ceb5f6e088923beaa9885226a3e677fec089964e" type="targz">mirrors://sourceforge/pyqt/PyQt5/PyQt-5.4.2/PyQt-gpl-5.4.2.tar.gz</Archive>
     </Source>
-    
+
     <Package>
         <Name>python3-qt5-common</Name>
         <Summary>Common files shared between python-qt5 and python3-qt5</Summary>
@@ -50,7 +50,7 @@
             <Path fileType="data">/usr/share/sip/PyQt5</Path>
         </Files>
     </Package>
-    
+
     <Package>
         <Name>python3-qt5</Name>
         <Summary>A set of Python 3.x bindings for the Qt 5.x Toolkit</Summary>
@@ -74,7 +74,7 @@
             <Path fileType="library">/usr/lib/qt5/plugins</Path>
         </Files>
     </Package>
-    
+
     <Package>
         <Name>python3-qt5-docs</Name>
         <Summary>Documentation for python-qt5 bindings</Summary>
@@ -85,7 +85,7 @@
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
-    
+
     <History>
         <Update release="2">
             <Date>2015-09-07</Date>
diff --git a/programming/language/python/sip3/actions.py b/programming/language/python/sip/actions.py
similarity index 90%
rename from programming/language/python/sip3/actions.py
rename to programming/language/python/sip/actions.py
index eb44f1d43b..02a17fec25 100644
--- a/programming/language/python/sip3/actions.py
+++ b/programming/language/python/sip/actions.py
@@ -9,7 +9,6 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import pythonmodules
 from pisi.actionsapi import get
-
 WorkDir = "sip-%s" % get.srcVERSION()
 py3dir = "python3.4"
 
@@ -17,7 +16,7 @@ def setup():
     pythonmodules.run('configure.py \
                     -b /usr/bin \
                     -d /usr/lib/%s/site-packages/ \
-                    -e /usr/include/%sm/ \
+                    -e /usr/include/%s/ \
                     CFLAGS="%s" CXXFLAGS="%s"' % (py3dir, py3dir, get.CFLAGS(), get.CXXFLAGS()), pyVer = "3")
 
 def build():
@@ -27,4 +26,5 @@ def install():
     autotools.rawInstall("DESTDIR=%s -C sipgen" % get.installDIR())
 
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-    pisitools.rename("/usr/bin/sip", "sip3")
+
+
diff --git a/programming/language/python/sip3/files/disable-rpaths.diff b/programming/language/python/sip/files/disable-rpaths.diff
similarity index 100%
rename from programming/language/python/sip3/files/disable-rpaths.diff
rename to programming/language/python/sip/files/disable-rpaths.diff
diff --git a/programming/language/python/sip3/files/fix-linking.diff b/programming/language/python/sip/files/fix-linking.diff
similarity index 100%
rename from programming/language/python/sip3/files/fix-linking.diff
rename to programming/language/python/sip/files/fix-linking.diff
diff --git a/programming/language/python/sip3/files/no-strip.patch b/programming/language/python/sip/files/no-strip.patch
similarity index 100%
rename from programming/language/python/sip3/files/no-strip.patch
rename to programming/language/python/sip/files/no-strip.patch
diff --git a/programming/language/python/sip3/files/sip-outoftree.patch b/programming/language/python/sip/files/sip-outoftree.patch
similarity index 100%
rename from programming/language/python/sip3/files/sip-outoftree.patch
rename to programming/language/python/sip/files/sip-outoftree.patch
diff --git a/programming/language/python/sip3/pspec.xml b/programming/language/python/sip/pspec.xml
similarity index 70%
rename from programming/language/python/sip3/pspec.xml
rename to programming/language/python/sip/pspec.xml
index 9f0c060166..e5efe7d98a 100644
--- a/programming/language/python/sip3/pspec.xml
+++ b/programming/language/python/sip/pspec.xml
@@ -1,6 +1,6 @@
 <PISI>
     <Source>
-        <Name>sip3</Name>
+        <Name>sip</Name>
         <Homepage>http://www.riverbankcomputing.co.uk/sip</Homepage>
         <Packager>
             <Name>Ayhan Yalçınsoy</Name>
@@ -19,9 +19,8 @@
             <Patch level="1">sip-outoftree.patch</Patch>
         </Patches>
     </Source>
-
     <Package>
-        <Name>sip3</Name>
+        <Name>sip</Name>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="executable">/usr/local/bin</Path>
@@ -30,48 +29,37 @@
             <Path fileType="data">/usr/share/sip3</Path>
         </Files>
         <AdditionalFiles>
-            <AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip3/disable-rpaths.diff">disable-rpaths.diff</AdditionalFile>
-            <AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip3/fix-linking.diff">fix-linking.diff</AdditionalFile>
+            <AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip/disable-rpaths.diff">disable-rpaths.diff</AdditionalFile>
+            <AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip/fix-linking.diff">fix-linking.diff</AdditionalFile>
         </AdditionalFiles>
         <Summary>Development files for qscintilla2</Summary>
         <RuntimeDependencies>
             <Dependency>libgcc</Dependency>
         </RuntimeDependencies>
     </Package>
-
     <Package>
-        <Name>python3-sip3</Name>
+        <Name>python3-sip</Name>
         <Files>
             <Path fileType="library">/usr/lib/python3*</Path>
         </Files>
-        <AdditionalFiles>
-            <AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip3/disable-rpaths.diff">disable-rpaths.diff</AdditionalFile>
-            <AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip3/fix-linking.diff">fix-linking.diff</AdditionalFile>
-        </AdditionalFiles>
         <Summary>Python 3.x SIP bindings for C and C++ libraries</Summary>
         <RuntimeDependencies>
             <Dependency>libgcc</Dependency>
             <Dependency>python3</Dependency>
-            <Dependency release="current">sip3</Dependency>
+            <Dependency release="current">sip</Dependency>
         </RuntimeDependencies>
     </Package>
-
     <Package>
-        <Name>sip3-devel</Name>
+        <Name>sip-devel</Name>
         <Files>
             <Path fileType="header">/usr/include</Path>
         </Files>
-        <AdditionalFiles>
-            <AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip3/disable-rpaths.diff">disable-rpaths.diff</AdditionalFile>
-            <AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip3/fix-linking.diff">fix-linking.diff</AdditionalFile>
-        </AdditionalFiles>
         <Summary>Development files for sip</Summary>
         <RuntimeDependencies>
-            <Dependency release="current">python3-sip3</Dependency>
-            <Dependency release="current">sip3</Dependency>
+            <Dependency release="current">python3-sip</Dependency>
+            <Dependency release="current">sip</Dependency>
         </RuntimeDependencies>
     </Package>
-
     <History>
         <Update release="2">
             <Date>2015-06-14</Date>
diff --git a/programming/language/python/sip3/translations.xml b/programming/language/python/sip/translations.xml
similarity index 100%
rename from programming/language/python/sip3/translations.xml
rename to programming/language/python/sip/translations.xml