diff --git a/desktop/kde/applications/kdepim-addons/pspec.xml b/desktop/kde/applications/kdepim-addons/pspec.xml
index ed1649ff6e..c3706ebf7e 100644
--- a/desktop/kde/applications/kdepim-addons/pspec.xml
+++ b/desktop/kde/applications/kdepim-addons/pspec.xml
@@ -128,8 +128,7 @@
             <Dependency>akonadi-contacts</Dependency>
             <Dependency>kdelibs4-support</Dependency>
             <Dependency>kidentitymanagement</Dependency>
-            <Dependency>gpgme</Dependency>
-            <Dependency>kdepimlibs</Dependency>
+            <Dependency>gpgme</Dependency>            
             <Dependency>kjobwidgets</Dependency>
             <Dependency>grantlee-qt5</Dependency>
         </RuntimeDependencies>
diff --git a/desktop/kde/applications/messagelib/pspec.xml b/desktop/kde/applications/messagelib/pspec.xml
index 34e3b48456..473d18d66c 100644
--- a/desktop/kde/applications/messagelib/pspec.xml
+++ b/desktop/kde/applications/messagelib/pspec.xml
@@ -15,58 +15,53 @@
         <Description>KDE PIM library providing support for mail applications</Description>
         <Archive sha1sum="72a8249e8193e39466319ab36a3d12ce08a5c3bb" type="tarxz">mirrors://kde/stable/applications/16.12.0/src/messagelib-16.12.0.tar.xz</Archive>
         <BuildDependencies>
-             <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
-             <Dependency versionFrom="5.1">grantlee-qt5</Dependency>
-             <Dependency versionFrom="5.1.40">kmime-devel</Dependency>
-             <Dependency versionFrom="5.26.0">extra-cmake-modules</Dependency>
-             <Dependency versionFrom="5.26.0">karchive-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kcodecs-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kcompletion-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kconfig-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kconfigwidgets-devel</Dependency>
-             <Dependency versionFrom="5.26.0">ki18n-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kiconthemes-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kio-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kitemviews-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kjobwidgets-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kservice-devel</Dependency>
-             <Dependency versionFrom="5.26.0">ktextwidgets-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kwidgetsaddons-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kimap-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kwindowsystem-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kxmlgui-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kitemmodels-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kdoctools-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kemoticons-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kinit-devel</Dependency>
-             <Dependency versionFrom="5.26.0">kunitconversion-devel</Dependency>
-             <Dependency versionFrom="5.26.0">sonnet-devel</Dependency>
-             <Dependency versionFrom="5.26.0">syntax-highlighting-devel</Dependency>
-             <Dependency versionFrom="5.4.0">akonadi-devel</Dependency>
-             <Dependency versionFrom="5.4.0">akonadi-mime-devel</Dependency>
-             <Dependency versionFrom="5.4.0">akonadi-contacts-devel</Dependency>
-             <Dependency versionFrom="5.4.0">akonadi-notes-devel</Dependency>
-             <Dependency versionFrom="5.4.0">akonadi-search-devel</Dependency>
-             <Dependency versionFrom="5.4.0">grantleetheme-devel</Dependency>
-             <Dependency versionFrom="5.4.0">kcontacts-devel</Dependency>
-             <Dependency versionFrom="5.4.0">kdepim-apps-libs-devel</Dependency>
-             <Dependency versionFrom="5.4.0">kidentitymanagement-devel</Dependency>
-             <Dependency versionFrom="5.4.0">kldap-devel</Dependency>
-             <Dependency versionFrom="5.4.0">kmailtransport-devel</Dependency>
-             <Dependency versionFrom="5.4.0">kmbox-devel</Dependency>
-             <Dependency versionFrom="5.4.0">kpimtextedit-devel</Dependency>
-             <Dependency versionFrom="5.4.0">libgravatar-devel</Dependency>
-             <Dependency versionFrom="5.4.0">libkdepim-devel</Dependency>
-             <Dependency versionFrom="5.4.0">libkleo-devel</Dependency>
-             <Dependency versionFrom="5.4.0">pimcommon-devel</Dependency>
-             <Dependency versionFrom="5.6.2">qt5-base-devel</Dependency>
-             <Dependency versionFrom="5.6.2">qt5-webengine-devel</Dependency>
-             <Dependency versionFrom="5.6.2">qt5-webkit-devel</Dependency>
-             <Dependency versionFrom="2.1.26">cyrus-sasl-devel</Dependency>
-             <Dependency>git</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>boost-devel</Dependency>
+            <Dependency>kdoctools-devel</Dependency>
+            <Dependency>mailimporter-devel</Dependency>
+            <Dependency>libgravatar-devel</Dependency>
+            <Dependency>kdepim-apps-libs-devel</Dependency>
+            <Dependency>kidentitymanagement-devel</Dependency>
+            <Dependency>kmailtransport-devel</Dependency>
+            <Dependency>kmailtransport-devel</Dependency>
+            <Dependency>kmbox-devel</Dependency>
+            <Dependency>akonadi-devel</Dependency>
+            <Dependency>kjobwidgets-devel</Dependency>
+            <Dependency>solid-devel</Dependency>
+            <Dependency>kitemmodels-devel</Dependency>
+            <Dependency>kdelibs4-support-devel</Dependency>
+            <Dependency>qt5-webkit-devel</Dependency>
+            <Dependency>kemoticons-devel</Dependency>
+            <Dependency>kinit-devel</Dependency>
+            <Dependency>kunitconversion-devel</Dependency>
+            <Dependency>kmime-devel</Dependency>
+            <Dependency>kcontacts-devel</Dependency>
+            <Dependency>kcalcore-devel</Dependency>
+            <Dependency>kdewebkit-devel</Dependency>            
+            <Dependency>akonadi-calendar-devel</Dependency>
+            <Dependency>akonadi-search-devel</Dependency>
+            <Dependency>kpimtextedit-devel</Dependency>
+            <Dependency>kimap-devel</Dependency>
+            <Dependency>kldap-devel</Dependency>
+            <Dependency>grantleetheme-devel</Dependency>
+            <Dependency>pimcommon-devel</Dependency>
+            <Dependency>libkleo-devel</Dependency>
+            <Dependency>libkdepim-devel</Dependency>
+            <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
+            <Dependency>grantlee-qt5-devel</Dependency>
+            <Dependency>qt5-declarative-devel</Dependency>
+            <Dependency>qt5-webengine-devel</Dependency>
+            <Dependency>akonadi-notes-devel</Dependency>
+            <Dependency>akonadi-mime-devel</Dependency>
+            <Dependency>akonadi-contacts-devel</Dependency>
+            <Dependency>syntax-highlighting-devel</Dependency>
+            <Dependency versionFrom="2.4.41">openldap-client</Dependency>
+            <Dependency versionFrom="2.1.26">cyrus-sasl-devel</Dependency>
         </BuildDependencies>
     </Source>
-
+   
+   
     <Package>
         <Name>messagelib</Name>
         <RuntimeDependencies>
@@ -113,7 +108,7 @@
             <Dependency>knotifications</Dependency>
             <Dependency>kwidgetsaddons</Dependency>
             <Dependency>kdepim-apps-libs</Dependency>
-            <Dependency>kidentitymanagement</Dependency>
+            <Dependency>syntax-highlighting</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>