diff --git a/desktop/kde/application/libkleo/actions.py b/desktop/kde/application/libkleo/actions.py
new file mode 100644
index 0000000000..59e83cc850
--- /dev/null
+++ b/desktop/kde/application/libkleo/actions.py
@@ -0,0 +1,16 @@
+#!/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 kde5
+
+def setup():
+    kde5.configure()
+
+def build():
+    kde5.make()
+
+def install():
+    kde5.install()
\ No newline at end of file
diff --git a/desktop/kde/application/libkleo/pspec.xml b/desktop/kde/application/libkleo/pspec.xml
new file mode 100644
index 0000000000..b245922b83
--- /dev/null
+++ b/desktop/kde/application/libkleo/pspec.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>libkleo</Name>
+        <Homepage>http://www.kde.org</Homepage>
+        <Packager>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Packager>
+        <License>LGPLv2</License>
+        <IsA>library</IsA>
+        <Summary>Common libraries for KDE PIM</Summary>
+        <Description>Common libraries for KDE PIM</Description>
+        <Archive sha1sum="4c9d5573706f6cd2a3934e41d9e8799d6dd44322" type="tarxz">mirrors://kde/stable/applications/16.04.1/src/libkleo-16.04.1.tar.xz</Archive>
+        <BuildDependencies>
+            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>boost-devel</Dependency>
+            <Dependency>gpgme-devel</Dependency>
+            <Dependency>qt5-sql-sqlite</Dependency>
+            <Dependency>qt5-sql-mysql</Dependency>
+            <Dependency>qt5-sql-odbc</Dependency>
+            <Dependency>qt5-sql-postgresql</Dependency>
+            <Dependency>prison-qt5-devel</Dependency>
+            <Dependency>kmbox-devel</Dependency>
+            <Dependency>qt5-phonon-devel</Dependency>
+            <Dependency>akonadi-devel</Dependency>
+            <Dependency>libical-devel</Dependency>
+            <Dependency>libqjson-devel</Dependency>
+            <Dependency>libgpg-error-devel</Dependency>
+            <Dependency>libxslt-devel</Dependency>
+            <Dependency versionFrom="2.4.41">openldap-client</Dependency>
+            <Dependency versionFrom="2.1.26">cyrus-sasl-devel</Dependency>
+            <Dependency>kitemviews-devel</Dependency>
+            <Dependency>kio-devel</Dependency>
+            <Dependency>kdelibs4-support-devel</Dependency>
+            <Dependency>kdesignerplugin</Dependency>
+            <Dependency>kdoctools-devel</Dependency>
+            <Dependency>kemoticons-devel</Dependency>
+            <Dependency>kitemmodels-devel</Dependency>
+            <Dependency>kinit-devel</Dependency>
+            <Dependency>kunitconversion-devel</Dependency>
+            <Dependency>kmime-devel</Dependency>
+            <Dependency>kcontacts-devel</Dependency>
+            <Dependency>kcalcore-devel</Dependency>
+            <Dependency>kldap-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>gpgmepp-devel</Dependency>
+        </BuildDependencies>
+    </Source>
+
+    <Package>
+        <Name>libkleo</Name>
+        <RuntimeDependencies>
+            <Dependency>qt5-base</Dependency>
+            <Dependency>kio</Dependency>
+            <Dependency>ki18n</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>kcodecs</Dependency>
+            <Dependency>kmime</Dependency>
+            <Dependency>kldap</Dependency>
+            <Dependency>kxmlgui</Dependency>
+            <Dependency>kcalcore</Dependency>
+            <Dependency>kcontacts</Dependency>
+            <Dependency>kconfig</Dependency>
+            <Dependency>libxml2</Dependency>
+            <Dependency>kservice</Dependency>
+            <Dependency>kguiaddons</Dependency>
+            <Dependency>kitemviews</Dependency>
+            <Dependency>kcompletion</Dependency>
+            <Dependency>kcoreaddons</Dependency>
+            <Dependency>kdbusaddons</Dependency>
+            <Dependency>kiconthemes</Dependency>
+            <Dependency>kitemmodels</Dependency>
+            <Dependency>ktextwidgets</Dependency>
+            <Dependency>kconfigwidgets</Dependency>
+            <Dependency>kwidgetsaddons</Dependency>
+            <Dependency>kdelibs4-support</Dependency>
+            <Dependency>qt5-phonon</Dependency>
+            <Dependency>prison-qt5</Dependency>
+            <Dependency>akonadi</Dependency>
+            <Dependency>gpgmepp</Dependency>
+            <Dependency>kpimtextedit</Dependency>
+            <Dependency>kwindowsystem</Dependency>
+            <Dependency versionFrom="2.1.26">cyrus-sasl</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="config">/etc/xdg</Path>
+            <Path fileType="library">/usr/lib</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="data">/usr/mkspecs/</Path>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="data">/usr/share/mime</Path>
+            <Path fileType="data">/usr/share/icons</Path>
+            <Path fileType="data">/usr/share/kservices5</Path>
+            <Path fileType="data">/usr/share/kservicetypes5</Path>
+            <Path fileType="data">/usr/share/dbus-1</Path>
+            <Path fileType="data">/usr/share/config.kcfg</Path>
+            <Path fileType="data">/usr/share/kf5</Path>
+            <Path fileType="data">/usr/share/config</Path>
+            <Path fileType="data">/usr/share/akonadi</Path>
+            <Path fileType="data">/usr/share/akonadicontact/grantleetheme/default</Path>
+            <Path fileType="data">/usr/share/libkleopatra</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>libkleo-devel</Name>
+        <Summary>Development package for libkleo libraries</Summary>
+        <Description>Contains development tools and header files for libkleo</Description>
+        <RuntimeDependencies>
+            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>boost-devel</Dependency>
+            <Dependency release="current">libkleo</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="data">/usr/lib/cmake</Path>
+            <Path fileType="header">/usr/include</Path>
+            <Path fileType="data">/usr/lib/gpgmepp</Path>
+            <Path fileType="data">/usr/share/kde4/apps/cmake</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="1">
+            <Date>2016-04-25</Date>
+            <Version>16.04.1</Version>
+            <Comment>First release</Comment>
+            <Name>Yusuf Aydemir</Name>
+            <Email>yusuf.aydemir@pisilinux.org</Email>
+        </Update>
+    </History>
+</PISI>
diff --git a/pisi-index.xml b/pisi-index.xml
index 3da8406823..c4a13c75d8 100644
--- a/pisi-index.xml
+++ b/pisi-index.xml
@@ -42825,6 +42825,136 @@
             </Update>
         </History>
     </SpecFile>
+    <SpecFile>
+        <Source>
+            <Name>libkleo</Name>
+            <Homepage>http://www.kde.org</Homepage>
+            <Packager>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Packager>
+            <License>LGPLv2</License>
+            <IsA>library</IsA>
+            <PartOf>desktop.kde.application</PartOf>
+            <Summary xml:lang="en">Common libraries for KDE PIM</Summary>
+            <Description xml:lang="en">Common libraries for KDE PIM</Description>
+            <Archive type="tarxz" sha1sum="4c9d5573706f6cd2a3934e41d9e8799d6dd44322">mirrors://kde/stable/applications/16.04.1/src/libkleo-16.04.1.tar.xz</Archive>
+            <BuildDependencies>
+                <Dependency>qt5-base-devel</Dependency>
+                <Dependency>boost-devel</Dependency>
+                <Dependency>gpgme-devel</Dependency>
+                <Dependency>qt5-sql-sqlite</Dependency>
+                <Dependency>qt5-sql-mysql</Dependency>
+                <Dependency>qt5-sql-odbc</Dependency>
+                <Dependency>qt5-sql-postgresql</Dependency>
+                <Dependency>prison-qt5-devel</Dependency>
+                <Dependency>kmbox-devel</Dependency>
+                <Dependency>qt5-phonon-devel</Dependency>
+                <Dependency>akonadi-devel</Dependency>
+                <Dependency>libical-devel</Dependency>
+                <Dependency>libqjson-devel</Dependency>
+                <Dependency>libgpg-error-devel</Dependency>
+                <Dependency>libxslt-devel</Dependency>
+                <Dependency versionFrom="2.4.41">openldap-client</Dependency>
+                <Dependency versionFrom="2.1.26">cyrus-sasl-devel</Dependency>
+                <Dependency>kitemviews-devel</Dependency>
+                <Dependency>kio-devel</Dependency>
+                <Dependency>kdelibs4-support-devel</Dependency>
+                <Dependency>kdesignerplugin</Dependency>
+                <Dependency>kdoctools-devel</Dependency>
+                <Dependency>kemoticons-devel</Dependency>
+                <Dependency>kitemmodels-devel</Dependency>
+                <Dependency>kinit-devel</Dependency>
+                <Dependency>kunitconversion-devel</Dependency>
+                <Dependency>kmime-devel</Dependency>
+                <Dependency>kcontacts-devel</Dependency>
+                <Dependency>kcalcore-devel</Dependency>
+                <Dependency>kldap-devel</Dependency>
+                <Dependency>extra-cmake-modules</Dependency>
+                <Dependency>gpgmepp-devel</Dependency>
+            </BuildDependencies>
+            <SourceURI>desktop/kde/application/libkleo/pspec.xml</SourceURI>
+        </Source>
+        <Package>
+            <Name>libkleo</Name>
+            <RuntimeDependencies>
+                <Dependency>qt5-base</Dependency>
+                <Dependency>kio</Dependency>
+                <Dependency>ki18n</Dependency>
+                <Dependency>libgcc</Dependency>
+                <Dependency>kcodecs</Dependency>
+                <Dependency>kmime</Dependency>
+                <Dependency>kldap</Dependency>
+                <Dependency>kxmlgui</Dependency>
+                <Dependency>kcalcore</Dependency>
+                <Dependency>kcontacts</Dependency>
+                <Dependency>kconfig</Dependency>
+                <Dependency>libxml2</Dependency>
+                <Dependency>kservice</Dependency>
+                <Dependency>kguiaddons</Dependency>
+                <Dependency>kitemviews</Dependency>
+                <Dependency>kcompletion</Dependency>
+                <Dependency>kcoreaddons</Dependency>
+                <Dependency>kdbusaddons</Dependency>
+                <Dependency>kiconthemes</Dependency>
+                <Dependency>kitemmodels</Dependency>
+                <Dependency>ktextwidgets</Dependency>
+                <Dependency>kconfigwidgets</Dependency>
+                <Dependency>kwidgetsaddons</Dependency>
+                <Dependency>kdelibs4-support</Dependency>
+                <Dependency>qt5-phonon</Dependency>
+                <Dependency>prison-qt5</Dependency>
+                <Dependency>akonadi</Dependency>
+                <Dependency>gpgmepp</Dependency>
+                <Dependency>kpimtextedit</Dependency>
+                <Dependency>kwindowsystem</Dependency>
+                <Dependency versionFrom="2.1.26">cyrus-sasl</Dependency>
+            </RuntimeDependencies>
+            <Files>
+                <Path fileType="config">/etc/xdg</Path>
+                <Path fileType="library">/usr/lib</Path>
+                <Path fileType="doc">/usr/share/doc</Path>
+                <Path fileType="data">/usr/mkspecs/</Path>
+                <Path fileType="executable">/usr/bin</Path>
+                <Path fileType="data">/usr/share/mime</Path>
+                <Path fileType="data">/usr/share/icons</Path>
+                <Path fileType="data">/usr/share/kservices5</Path>
+                <Path fileType="data">/usr/share/kservicetypes5</Path>
+                <Path fileType="data">/usr/share/dbus-1</Path>
+                <Path fileType="data">/usr/share/config.kcfg</Path>
+                <Path fileType="data">/usr/share/kf5</Path>
+                <Path fileType="data">/usr/share/config</Path>
+                <Path fileType="data">/usr/share/akonadi</Path>
+                <Path fileType="data">/usr/share/akonadicontact/grantleetheme/default</Path>
+                <Path fileType="data">/usr/share/libkleopatra</Path>
+            </Files>
+        </Package>
+        <Package>
+            <Name>libkleo-devel</Name>
+            <Summary xml:lang="en">Development package for libkleo libraries</Summary>
+            <Description xml:lang="en">Contains development tools and header files for libkleo</Description>
+            <RuntimeDependencies>
+                <Dependency>qt5-base-devel</Dependency>
+                <Dependency>boost-devel</Dependency>
+                <Dependency release="1">libkleo</Dependency>
+            </RuntimeDependencies>
+            <Files>
+                <Path fileType="data">/usr/lib/cmake</Path>
+                <Path fileType="header">/usr/include</Path>
+                <Path fileType="data">/usr/lib/gpgmepp</Path>
+                <Path fileType="data">/usr/share/kde4/apps/cmake</Path>
+            </Files>
+        </Package>
+        <History>
+            <Update release="1">
+                <Date>2016-04-25</Date>
+                <Version>16.04.1</Version>
+                <Comment>First release</Comment>
+                <Name>Yusuf Aydemir</Name>
+                <Email>yusuf.aydemir@pisilinux.org</Email>
+            </Update>
+        </History>
+    </SpecFile>
     <SpecFile>
         <Source>
             <Name>ktnef</Name>
@@ -45984,8 +46114,8 @@
             <IsA>library</IsA>
             <IsA>app:library</IsA>
             <PartOf>desktop.kde.application</PartOf>
-            <Summary xml:lang="en">Libraries for KDE PIM applications</Summary>
-            <Description xml:lang="en">Libraries for KDE PIM applications</Description>
+            <Summary xml:lang="en">Mail importer library</Summary>
+            <Description xml:lang="en">Mail importer library</Description>
             <Archive type="tarxz" sha1sum="01fd3f5bf899ab6afbbb4117af6aaaa290e07d1d">mirrors://kde/stable/applications/16.04.0/src/mailimporter-16.04.0.tar.xz</Archive>
             <BuildDependencies>
                 <Dependency>qt5-base-devel</Dependency>
@@ -46051,7 +46181,7 @@
         </Package>
         <Package>
             <Name>mailimporter-devel</Name>
-            <Summary xml:lang="en">Development files for libkgapi</Summary>
+            <Summary xml:lang="en">Development files for mailimporter</Summary>
             <RuntimeDependencies>
                 <Dependency release="1">mailimporter</Dependency>
             </RuntimeDependencies>
@@ -92580,97 +92710,6 @@ Bu Skype SILK codec ve Xiph.Org &apos;s Celt codec teknolojisi dahil RFC 6716 ol
             </Update>
         </History>
     </SpecFile>
-    <Package>
-        <Name>libgravatar-devel</Name>
-        <Summary xml:lang="en">Development files for libgravatar</Summary>
-        <Description xml:lang="en">KDE PIM library providing Gravatar support</Description>
-        <IsA>library</IsA>
-        <PartOf>programming.devel</PartOf>
-        <License>GPLv2</License>
-        <RuntimeDependencies>
-            <Dependency release="1">libgravatar</Dependency>
-            <Dependency>qt5-base-devel</Dependency>
-            <Dependency>kxmlgui-devel</Dependency>
-            <Dependency>ki18n-devel</Dependency>
-            <Dependency>kconfig-devel</Dependency>
-            <Dependency>kservice-devel</Dependency>
-            <Dependency>kcoreaddons-devel</Dependency>
-        </RuntimeDependencies>
-        <History>
-            <Update release="1">
-                <Date>2016-04-25</Date>
-                <Version>16.04.0</Version>
-                <Comment>First release</Comment>
-                <Name>Yusuf Aydemir</Name>
-                <Email>yusuf.aydemir@pisilinux.org</Email>
-            </Update>
-        </History>
-        <BuildHost>farmV2</BuildHost>
-        <Distribution>PisiLinux</Distribution>
-        <DistributionRelease>2.0</DistributionRelease>
-        <Architecture>x86_64</Architecture>
-        <InstalledSize>14021</InstalledSize>
-        <PackageSize>4679</PackageSize>
-        <PackageHash>3879d81b259c184a633ff1158c1b4b7ab1da39d2</PackageHash>
-        <InstallTarHash>da39a3ee5e6b4b0d3255bfef95601890afd80709</InstallTarHash>
-        <PackageURI>desktop/kde/application/libgravatar/libgravatar-devel-16.04.0-1-p2-x86_64.pisi</PackageURI>
-        <PackageFormat>1.2</PackageFormat>
-        <Source>
-            <Name>libgravatar</Name>
-            <Homepage>http://www.kde.org</Homepage>
-            <Packager>
-                <Name>PisiLinux Community</Name>
-                <Email>admins@pisilinux.org</Email>
-            </Packager>
-        </Source>
-    </Package>
-    <Package>
-        <Name>libgravatar</Name>
-        <Summary xml:lang="en">KDE PIM library providing Gravatar support</Summary>
-        <Description xml:lang="en">KDE PIM library providing Gravatar support</Description>
-        <IsA>library</IsA>
-        <PartOf>desktop.kde.application</PartOf>
-        <License>GPLv2</License>
-        <RuntimeDependencies>
-            <Dependency>qt5-base</Dependency>
-            <Dependency>kxmlgui</Dependency>
-            <Dependency>ki18n</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>kconfig</Dependency>
-            <Dependency>kservice</Dependency>
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency>pimcommon</Dependency>
-            <Dependency>ktextwidgets</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-        </RuntimeDependencies>
-        <History>
-            <Update release="1">
-                <Date>2016-04-25</Date>
-                <Version>16.04.0</Version>
-                <Comment>First release</Comment>
-                <Name>Yusuf Aydemir</Name>
-                <Email>yusuf.aydemir@pisilinux.org</Email>
-            </Update>
-        </History>
-        <BuildHost>farmV2</BuildHost>
-        <Distribution>PisiLinux</Distribution>
-        <DistributionRelease>2.0</DistributionRelease>
-        <Architecture>x86_64</Architecture>
-        <InstalledSize>110206</InstalledSize>
-        <PackageSize>31412</PackageSize>
-        <PackageHash>a80cfe8dd02e85755ca2eebf544939a7c9c3caaa</PackageHash>
-        <InstallTarHash>da39a3ee5e6b4b0d3255bfef95601890afd80709</InstallTarHash>
-        <PackageURI>desktop/kde/application/libgravatar/libgravatar-16.04.0-1-p2-x86_64.pisi</PackageURI>
-        <PackageFormat>1.2</PackageFormat>
-        <Source>
-            <Name>libgravatar</Name>
-            <Homepage>http://www.kde.org</Homepage>
-            <Packager>
-                <Name>PisiLinux Community</Name>
-                <Email>admins@pisilinux.org</Email>
-            </Packager>
-        </Source>
-    </Package>
     <Component>
         <Name>system</Name>
         <LocalName xml:lang="en">FIXME</LocalName>
diff --git a/pisi-index.xml.sha1sum b/pisi-index.xml.sha1sum
index 247b596363..3289dab532 100644
--- a/pisi-index.xml.sha1sum
+++ b/pisi-index.xml.sha1sum
@@ -1 +1 @@
-062d7bb8310f4d0dd5370a82fadade39fbd45f1b
\ No newline at end of file
+474d1d92c18bb26d1a76734fbf3854352e33f3de
\ No newline at end of file
diff --git a/pisi-index.xml.xz b/pisi-index.xml.xz
index c46159c0a1..09773d98c2 100644
Binary files a/pisi-index.xml.xz and b/pisi-index.xml.xz differ
diff --git a/pisi-index.xml.xz.sha1sum b/pisi-index.xml.xz.sha1sum
index 4593898473..d7e491e10a 100644
--- a/pisi-index.xml.xz.sha1sum
+++ b/pisi-index.xml.xz.sha1sum
@@ -1 +1 @@
-574719a7f5e50ba54c71e179e2b98165c7d59dd9
\ No newline at end of file
+aac9cf136b7f1239597469cfa0ec3c33cc55d650
\ No newline at end of file