diff --git a/desktop/kde/application/kdepim/pspec.xml b/desktop/kde/application/kdepim/pspec.xml
index 33af33e449..3075d8297d 100644
--- a/desktop/kde/application/kdepim/pspec.xml
+++ b/desktop/kde/application/kdepim/pspec.xml
@@ -98,12 +98,22 @@
             <Dependency>curl-devel</Dependency>
             <Dependency>kdepim-runtime</Dependency>
             <Dependency>libxslt-devel</Dependency>
+            <Dependency>mailcommon-devel</Dependency>
+            <Dependency>messagelib-devel</Dependency>
+            <Dependency>mailimporter-devel</Dependency>
+            <Dependency>pimcommon-devel</Dependency>
+            <Dependency>libkleo-devel</Dependency>
+            <Dependency>kdepim-apps-libs-devel</Dependency>
+            <Dependency>grantleetheme-devel</Dependency>
+            <Dependency>kdgantt2-devel</Dependency>
+            <Dependency>incidenceeditor-devel</Dependency>
+            <Dependency>eventviews-devel</Dependency>
+            <Dependency>calendarsupport-devel</Dependency>
+            <Dependency>libksieve-devel</Dependency>
+            <Dependency>libkdepim-devel</Dependency>
+            <Dependency>libgravatar-devel</Dependency>
+            <Dependency>kmime-devel</Dependency>
         </BuildDependencies>
-        <Patches>
-<!--             <Patch level="1">alt-fix-linking.patch</Patch> -->
-<!--             <Patch level="1">alt-install-kalarm-helper.patch</Patch> -->
-<!--             <Patch level="1">CMakeLists.diff</Patch> -->
-        </Patches>
     </Source>
 
     <Package>
@@ -124,6 +134,9 @@
             <Dependency>gpgmepp</Dependency>
             <Dependency>kcodecs</Dependency>
             <Dependency>kconfig</Dependency>
+            <Dependency>pimcommon</Dependency>
+            <Dependency>mailcommon</Dependency>
+            <Dependency>messagelib</Dependency>
             <Dependency>kwallet</Dependency>
             <Dependency>kxmlgui</Dependency>
             <Dependency>karchive</Dependency>
@@ -143,6 +156,9 @@
             <Dependency>kitemviews</Dependency>
             <Dependency>qt5-phonon</Dependency>
             <Dependency>qt5-webkit</Dependency>
+            <Dependency>calendarsupport</Dependency>
+            <Dependency>kdepim-apps-libs</Dependency>
+            <Dependency>incidenceeditor</Dependency>
             <Dependency>kdepim-runtime</Dependency>
             <Dependency>kcompletion</Dependency>
             <Dependency>kcoreaddons</Dependency>
@@ -213,8 +229,7 @@
             <Path fileType="library">/usr/lib/libKF5SendLater.so.5.2.1</Path>
             <Path fileType="library">/usr/lib/libKF5TemplateParser.so.5</Path>
             <Path fileType="library">/usr/lib/libKF5TemplateParser.so.5.2.1</Path>
-            <Path fileType="library">/usr/lib/libpimsettingexporterprivate.so.5</Path>
-            <Path fileType="library">/usr/lib/libpimsettingexporterprivate.so.5.2.1</Path>
+            <Path fileType="library">/usr/lib/libpimsettingexporterprivate.so.*</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/accountwizard_plugin.so</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/designer</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/grantlee/5.0</Path>
@@ -349,6 +364,7 @@
             <Dependency>kwindowsystem</Dependency>
             <Dependency>kconfigwidgets</Dependency>
             <Dependency>knotifications</Dependency>
+            <Dependency>grantleetheme</Dependency>
             <Dependency>kwidgetsaddons</Dependency>
             <Dependency>kdelibs4-support</Dependency>
             <Dependency>kontactinterface</Dependency>
@@ -357,11 +373,9 @@
         <Files>
             <Path fileType="executable">/usr/bin/akregator</Path>
             <Path fileType="executable">/usr/bin/akregatorstorageexporter</Path>
+            <Path fileType="library">/usr/lib/libakregatorinterfaces.so.*</Path>
             <Path fileType="library">/usr/lib/libakregatorinterfaces.so</Path>
-            <Path fileType="library">/usr/lib/libakregatorinterfaces.so.5</Path>
-            <Path fileType="library">/usr/lib/libakregatorinterfaces.so.5.2.1</Path>
-            <Path fileType="library">/usr/lib/libakregatorprivate.so.5</Path>
-            <Path fileType="library">/usr/lib/libakregatorprivate.so.5.2.1</Path>
+            <Path fileType="library">/usr/lib/libakregatorprivate.so.*</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/akregator_config_advanced.so</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/akregator_config_appearance.so</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/akregator_config_archive.so</Path>
@@ -371,7 +385,6 @@
             <Path fileType="library">/usr/lib/qt5/plugins/akregatorpart.so</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/kontact_akregatorplugin.so</Path>
             <Path fileType="data">/usr/share/akregator/about</Path>
-            <Path fileType="data">/usr/share/appdata/akregator.appdata.xml</Path>
             <Path fileType="data">/usr/share/applications/org.kde.akregator.desktop</Path>
             <Path fileType="data">/usr/share/config.kcfg/akregator.kcfg</Path>
             <Path fileType="data">/usr/share/dbus-1/interfaces/org.kde.akregator.part.xml</Path>
@@ -397,8 +410,13 @@
             <Path fileType="data">/usr/share/kservices5/akregator_part.desktop</Path>
             <Path fileType="data">/usr/share/kservices5/feed.protocol</Path>
             <Path fileType="data">/usr/share/kservices5/kontact/akregatorplugin.desktop</Path>
+            <Path fileType="data">/usr/share/kservices5/akregator_config_adblock.desktop</Path>
             <Path fileType="data">/usr/share/kservicetypes5/akregator_plugin.desktop</Path>
             <Path fileType="data">/usr/share/kxmlgui5/akregator</Path>
+            <Path fileType="data">/usr/share/akregator/grantleetheme</Path>
+            <Path fileType="data">/usr/share/messageviewer/about/default/introduction_akregator.html</Path>
+            <Path fileType="data">/usr/share/appdata/org.kde.akregator.appdata.xml</Path>
+            <Path fileType="library">/usr/lib/qt5/plugins/akregator_config_adblock.so</Path>
         </Files>
         <Replaces>
             <Package>kdepim</Package>
@@ -437,9 +455,8 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/blogilo</Path>
-            <Path fileType="library">/usr/lib/libKF5ComposerEditorNG.so.5</Path>
-            <Path fileType="library">/usr/lib/libKF5ComposerEditorNG.so.5.2.1</Path>
-            <Path fileType="data">/usr/share/appdata/blogilo.appdata.xml</Path>
+            <Path fileType="library">/usr/lib/libKF5ComposerEditorNG.so.*</Path>
+            <Path fileType="data">/usr/share/appdata/org.kde.blogilo.appdata.xml</Path>
             <Path fileType="data">/usr/share/applications/org.kde.blogilo.desktop</Path>
             <Path fileType="data">/usr/share/composereditor/composereditorinitialhtml</Path>
             <Path fileType="data">/usr/share/config.kcfg/blogilo.kcfg</Path>
@@ -508,11 +525,10 @@
             <Path fileType="executable">/usr/bin/kaddressbook</Path>
             <Path fileType="config">/etc/xdg/kaddressbook_themes.knsrc</Path>
             <Path fileType="library">/usr/lib/akonadi/contact/editorpageplugins/cryptopageplugin.so</Path>
-            <Path fileType="library">/usr/lib/libkaddressbookprivate.so.5</Path>
-            <Path fileType="library">/usr/lib/libkaddressbookprivate.so.5.2.1</Path>
+            <Path fileType="library">/usr/lib/libkaddressbookprivate.so.*</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/kaddressbookpart.so</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/kontact_kaddressbookplugin.so</Path>
-            <Path fileType="data">/usr/share/appdata/kaddressbook.appdata.xml</Path>
+            <Path fileType="data">/usr/share/appdata/org.kde.kaddressbook.appdata.xml</Path>
             <Path fileType="data">/usr/share/applications/kaddressbook-importer.desktop</Path>
             <Path fileType="data">/usr/share/applications/org.kde.kaddressbook.desktop</Path>
             <Path fileType="data">/usr/share/icons/hicolor/128x128/apps/kaddressbook.png</Path>
@@ -582,7 +598,8 @@
             <Path fileType="config">/etc/dbus-1/system.d/org.kde.kalarmrtcwake.conf</Path>
             <Path fileType="config">/etc/xdg/autostart/kalarm.autostart.desktop</Path>
             <Path fileType="library">/usr/lib/kauth</Path>
-            <Path fileType="data">/usr/share/appdata/kalarm.appdata.xml</Path>
+            <Path fileType="library">/usr/lib/kalarm_helper</Path>
+            <Path fileType="data">/usr/share/appdata/org.kde.kalarm.appdata.xml</Path>
             <Path fileType="data">/usr/share/applications/org.kde.kalarm.desktop</Path>
             <Path fileType="data">/usr/share/config.kcfg/kalarmconfig.kcfg</Path>
             <Path fileType="data">/usr/share/dbus-1/interfaces/org.kde.kalarm.kalarm.xml</Path>
@@ -621,74 +638,6 @@
         </Conflicts>
     </Package>
     
-    <Package>
-        <Name>kleopatra</Name>
-        <Description>Certificate Manager and Unified Crypto GUI</Description>
-        <RuntimeDependencies>
-            <Dependency>gpgme</Dependency>
-            <Dependency>ki18n</Dependency>
-            <Dependency>kmime</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>gpgmepp</Dependency>
-            <Dependency>kconfig</Dependency>
-            <Dependency>kxmlgui</Dependency>
-            <Dependency>kcmutils</Dependency>
-            <Dependency>qt5-base</Dependency>
-            <Dependency>libassuan</Dependency>
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency>kdbusaddons</Dependency>
-            <Dependency>kiconthemes</Dependency>
-            <Dependency>ktextwidgets</Dependency>
-            <Dependency>libgpg-error</Dependency>
-            <Dependency>kwindowsystem</Dependency>
-            <Dependency>kconfigwidgets</Dependency>
-            <Dependency>knotifications</Dependency>
-            <Dependency>kwidgetsaddons</Dependency>
-            <Dependency release="current">libkdepim</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="executable">/usr/bin/kleopatra</Path>
-            <Path fileType="executable">/usr/bin/kwatchgnupg</Path>
-            <Path fileType="library">/usr/lib/libkleopatraclientcore.so</Path>
-            <Path fileType="library">/usr/lib/libkleopatraclientcore.so.1</Path>
-            <Path fileType="library">/usr/lib/libkleopatraclientcore.so.1.3.0</Path>
-            <Path fileType="library">/usr/lib/libkleopatraclientgui.so</Path>
-            <Path fileType="library">/usr/lib/libkleopatraclientgui.so.1</Path>
-            <Path fileType="library">/usr/lib/libkleopatraclientgui.so.1.3.0</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins/kcm_kleopatra.so</Path>
-            <Path fileType="data">/usr/share/appdata/kleopatra.appdata.xml</Path>
-            <Path fileType="data">/usr/share/applications/kleopatra_import.desktop</Path>
-            <Path fileType="data">/usr/share/applications/org.kde.kleopatra.desktop</Path>
-            <Path fileType="doc">/usr/share/doc/kde5/html/en/kleopatra</Path>
-            <Path fileType="doc">/usr/share/doc/kde5/html/en/kwatchgnupg</Path>
-            <Path fileType="data">/usr/share/icons/hicolor/128x128/apps/kleopatra.png</Path>
-            <Path fileType="data">/usr/share/icons/hicolor/16x16/apps/kleopatra.png</Path>
-            <Path fileType="data">/usr/share/icons/hicolor/22x22/apps/kleopatra.png</Path>
-            <Path fileType="data">/usr/share/icons/hicolor/256x256/apps/kleopatra.png</Path>
-            <Path fileType="data">/usr/share/icons/hicolor/32x32/apps/kleopatra.png</Path>
-            <Path fileType="data">/usr/share/icons/hicolor/48x48/apps/kleopatra.png</Path>
-            <Path fileType="data">/usr/share/icons/hicolor/64x64/apps/kleopatra.png</Path>
-            <Path fileType="data">/usr/share/kconf_update/kleopatra-15.08-kickoff.sh</Path>
-            <Path fileType="data">/usr/share/kconf_update/kleopatra.upd</Path>
-            <Path fileType="data">/usr/share/kleopatra/pics</Path>
-            <Path fileType="data">/usr/share/kservices5/kleopatra_config_appear.desktop</Path>
-            <Path fileType="data">/usr/share/kservices5/kleopatra_config_cryptooperations.desktop</Path>
-            <Path fileType="data">/usr/share/kservices5/kleopatra_config_dirserv.desktop</Path>
-            <Path fileType="data">/usr/share/kservices5/kleopatra_config_gnupgsystem.desktop</Path>
-            <Path fileType="data">/usr/share/kservices5/kleopatra_config_smimevalidation.desktop</Path>
-            <Path fileType="data">/usr/share/kservices5/kleopatra_decryptverifyfiles.desktop</Path>
-            <Path fileType="data">/usr/share/kservices5/kleopatra_decryptverifyfolders.desktop</Path>
-            <Path fileType="data">/usr/share/kservices5/kleopatra_signencryptfiles.desktop</Path>
-            <Path fileType="data">/usr/share/kservices5/kleopatra_signencryptfolders.desktop</Path>
-            <Path fileType="data">/usr/share/kwatchgnupg/pics</Path>
-        </Files>
-        <Replaces>
-            <Package>kdepim</Package>
-        </Replaces>
-        <Conflicts>
-            <Package>kdepim</Package>
-        </Conflicts>
-    </Package>
     
     <Package>
         <Name>kmail</Name>
@@ -724,6 +673,10 @@
             <Dependency>kcoreaddons</Dependency>
             <Dependency>kdbusaddons</Dependency>
             <Dependency>kiconthemes</Dependency>
+            <Dependency>libkleo</Dependency>
+            <Dependency>libksieve</Dependency>
+            <Dependency>libgravatar</Dependency>
+            <Dependency>mailimporter</Dependency>
             <Dependency>kitemmodels</Dependency>
             <Dependency>kjobwidgets</Dependency>
             <Dependency>kpimtextedit</Dependency>
@@ -754,20 +707,14 @@
             <Path fileType="config">/etc/xdg/kmail.antivirusrc</Path>
             <Path fileType="config">/etc/xdg/ksieve_script.knsrc</Path>
             <Path fileType="library">/usr/lib/libKF5KManageSieve.so</Path>
-            <Path fileType="library">/usr/lib/libKF5KManageSieve.so.5</Path>
-            <Path fileType="library">/usr/lib/libKF5KManageSieve.so.5.2.1</Path>
-            <Path fileType="library">/usr/lib/libKF5KSieve.so.5</Path>
-            <Path fileType="library">/usr/lib/libKF5KSieve.so.5.2.1</Path>
+            <Path fileType="library">/usr/lib/libKF5KManageSieve.so.*</Path>
+            <Path fileType="library">/usr/lib/libKF5KSieve.so.*</Path>
             <Path fileType="library">/usr/lib/libKF5KSieveUi.so</Path>
-            <Path fileType="library">/usr/lib/libKF5KSieveUi.so.5</Path>
-            <Path fileType="library">/usr/lib/libKF5KSieveUi.so.5.2.1</Path>
-            <Path fileType="library">/usr/lib/libKF5MessageList.so.5</Path>
-            <Path fileType="library">/usr/lib/libKF5MessageList.so.5.2.1</Path>
+            <Path fileType="library">/usr/lib/libKF5KSieveUi.so.*</Path>
+            <Path fileType="library">/usr/lib/libKF5MessageList.so.*</Path>
             <Path fileType="library">/usr/lib/libgrantleethemeeditor.so</Path>
-            <Path fileType="library">/usr/lib/libgrantleethemeeditor.so.5</Path>
-            <Path fileType="library">/usr/lib/libgrantleethemeeditor.so.5.2.1</Path>
-            <Path fileType="library">/usr/lib/libkmailprivate.so.5</Path>
-            <Path fileType="library">/usr/lib/libkmailprivate.so.5.2.1</Path>
+            <Path fileType="library">/usr/lib/libgrantleethemeeditor.so.*</Path>
+            <Path fileType="library">/usr/lib/libkmailprivate.so.*</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/kcm_kmail.so</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/kcm_kmailsummary.so</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/kcm_kpimidentities.so</Path>
@@ -884,15 +831,14 @@
             <Path fileType="executable">/usr/bin/akonadi_notes_agent</Path>
             <Path fileType="executable">/usr/bin/knotes</Path>
             <Path fileType="config">/etc/xdg/knotes_printing_theme.knsrc</Path>
-            <Path fileType="library">/usr/lib/libKF5NoteShared.so.5</Path>
-            <Path fileType="library">/usr/lib/libKF5NoteShared.so.5.2.1</Path>
-            <Path fileType="library">/usr/lib/libknotesprivate.so.5</Path>
-            <Path fileType="library">/usr/lib/libknotesprivate.so.5.2.1</Path>
+            <Path fileType="library">/usr/lib/libKF5NoteShared.so.*</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/kcm_knote.so</Path>
+            <Path fileType="library">/usr/lib/libnotesharedprivate.so.*</Path>
+            <Path fileType="library">/usr/lib/libknotesprivate.so.*</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/kcm_knotessummary.so</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/kontact_knotesplugin.so</Path>
             <Path fileType="data">/usr/share/akonadi/agents/notesagent.desktop</Path>
-            <Path fileType="data">/usr/share/appdata/knotes.appdata.xml</Path>
+            <Path fileType="data">/usr/share/appdata/org.kde.knotes.appdata.xml</Path>
             <Path fileType="data">/usr/share/applications/org.kde.knotes.desktop</Path>
             <Path fileType="data">/usr/share/config.kcfg/knotesglobalconfig.kcfg</Path>
             <Path fileType="data">/usr/share/dbus-1/interfaces/org.kde.KNotes.xml</Path>
@@ -995,12 +941,11 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/kontact</Path>
-            <Path fileType="library">/usr/lib/libkontactprivate.so.5</Path>
-            <Path fileType="library">/usr/lib/libkontactprivate.so.5.2.1</Path>
+            <Path fileType="library">/usr/lib/libkontactprivate.so.*</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/kcm_kontact.so</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/kcm_kontactsummary.so</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/kontact_summaryplugin.so</Path>
-            <Path fileType="data">/usr/share/appdata/Kontact.appdata.xml</Path>
+            <Path fileType="data">/usr/share/appdata/org.kde.kontact.appdata.xml</Path>
             <Path fileType="data">/usr/share/applications/kontact-admin.desktop</Path>
             <Path fileType="data">/usr/share/applications/org.kde.kontact.desktop</Path>
             <Path fileType="data">/usr/share/config.kcfg/kontact.kcfg</Path>
@@ -1061,6 +1006,7 @@
             <Dependency>kitemmodels</Dependency>
             <Dependency>kjobwidgets</Dependency>
             <Dependency>kpimtextedit</Dependency>
+            <Dependency>eventviews</Dependency>
             <Dependency>kwindowsystem</Dependency>
             <Dependency>akonadi-search</Dependency>
             <Dependency>kconfigwidgets</Dependency>
@@ -1080,13 +1026,10 @@
             <Path fileType="config">/etc/xdg/autostart/org.kde.korgac.desktop</Path>
             <Path fileType="config">/etc/xdg/korganizer.knsrc</Path>
             <Path fileType="library">/usr/lib/libkorganizer_core.so</Path>
-            <Path fileType="library">/usr/lib/libkorganizer_core.so.5</Path>
-            <Path fileType="library">/usr/lib/libkorganizer_core.so.5.2.1</Path>
+            <Path fileType="library">/usr/lib/libkorganizer_core.so.*</Path>
             <Path fileType="library">/usr/lib/libkorganizer_interfaces.so</Path>
-            <Path fileType="library">/usr/lib/libkorganizer_interfaces.so.5</Path>
-            <Path fileType="library">/usr/lib/libkorganizer_interfaces.so.5.2.1</Path>
-            <Path fileType="library">/usr/lib/libkorganizerprivate.so.5</Path>
-            <Path fileType="library">/usr/lib/libkorganizerprivate.so.5.2.1</Path>
+            <Path fileType="library">/usr/lib/libkorganizer_interfaces.so.*</Path>
+            <Path fileType="library">/usr/lib/libkorganizerprivate.so.*</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/kcm_apptsummary.so</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/kcm_korganizer.so</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/kcm_sdsummary.so</Path>
@@ -1100,7 +1043,7 @@
             <Path fileType="library">/usr/lib/qt5/plugins/korg_picoftheday.so</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/korg_thisdayinhistory.so</Path>
             <Path fileType="library">/usr/lib/qt5/plugins/korganizerpart.so</Path>
-            <Path fileType="data">/usr/share/appdata/korganizer.appdata.xml</Path>
+            <Path fileType="data">/usr/share/appdata/org.kde.korganizer.appdata.xml</Path>
             <Path fileType="data">/usr/share/applications/korganizer-import.desktop</Path>
             <Path fileType="data">/usr/share/applications/org.kde.korganizer.desktop</Path>
             <Path fileType="data">/usr/share/config.kcfg/korganizer.kcfg</Path>
@@ -1217,7 +1160,7 @@
 
     <History>
         <Update release="2">
-            <Date>2016-05-20</Date>
+            <Date>2016-05-23</Date>
             <Version>16.04.0</Version>
             <Comment>Version Bump.</Comment>
             <Name>Burak Ertürk</Name>