diff --git a/desktop/kde/applications/akonadi-calendar/pspec.xml b/desktop/kde/applications/akonadi-calendar/pspec.xml
index e1c19e637d..f801a7a53b 100644
--- a/desktop/kde/applications/akonadi-calendar/pspec.xml
+++ b/desktop/kde/applications/akonadi-calendar/pspec.xml
@@ -37,6 +37,7 @@
             <Dependency>kcalcore-devel</Dependency>
             <Dependency>kcalutils-devel</Dependency>
             <Dependency>akonadi-contacts-devel</Dependency>
+            <Dependency>kdepimlibs-devel</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -64,6 +65,7 @@
             <Dependency>kconfigwidgets</Dependency>
             <Dependency>kmailtransport</Dependency>
             <Dependency>kwidgetsaddons</Dependency>
+            <Dependency>kdepimlibs</Dependency>
             <Dependency>kidentitymanagement</Dependency>
             <Dependency>akonadi-mime</Dependency>
             <Dependency>akonadi-contacts</Dependency>
diff --git a/desktop/kde/applications/akonadi-notes/pspec.xml b/desktop/kde/applications/akonadi-notes/pspec.xml
index 2137e66aa0..4fee648a4a 100644
--- a/desktop/kde/applications/akonadi-notes/pspec.xml
+++ b/desktop/kde/applications/akonadi-notes/pspec.xml
@@ -36,16 +36,9 @@
         <Name>akonadi-notes</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
-            <Dependency>ki18n</Dependency>
-            <Dependency>akonadi</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>kio</Dependency>
-            <Dependency>kmime</Dependency>            
-            <Dependency>kconfig</Dependency>
-            <Dependency>kxmlgui</Dependency>            
-            <Dependency>kcoreaddons</Dependency>
-            <Dependency>kdbusaddons</Dependency>            
-            <Dependency>kwidgetsaddons</Dependency>            
+            <Dependency>ki18n</Dependency>            
+            <Dependency>libgcc</Dependency>            
+            <Dependency>kmime</Dependency>                       
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/usr/share</Path>
diff --git a/desktop/kde/applications/okular/pspec.xml b/desktop/kde/applications/okular/pspec.xml
index f865e14903..a89df885e2 100644
--- a/desktop/kde/applications/okular/pspec.xml
+++ b/desktop/kde/applications/okular/pspec.xml
@@ -92,6 +92,8 @@
             <Dependency>qt5-phonon</Dependency>
             <Dependency>chmlib</Dependency>
             <Dependency>kjobwidgets</Dependency>
+            <Dependency>qt5-speech</Dependency>
+            <Dependency>kdegraphics-mobipocket</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc/xdg</Path>
diff --git a/distribution.xml b/distribution.xml
index 6e103291a2..81113cc750 100644
--- a/distribution.xml
+++ b/distribution.xml
@@ -7,8 +7,7 @@
     <Description xml:lang="nl">PisiLinux 2.0 main Opslagplaats</Description>
     <Type>Core</Type>
     <BinaryName>PisiLinux</BinaryName>
-    <Obsoletes>
-        <Package>kdepim</Package>
+    <Obsoletes>        
         <Package>kdgantt2</Package>
         <Package>gpgmepp</Package>
         <Package>prison-qt5</Package>
diff --git a/util/crypt/gpgme/actions.py b/util/crypt/gpgme/actions.py
index f6ec08daa5..7170efda58 100644
--- a/util/crypt/gpgme/actions.py
+++ b/util/crypt/gpgme/actions.py
@@ -21,6 +21,9 @@ def build():
     #autotools.make("check")
 
 def install():
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())    
+    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    
+    pisitools.insinto("/usr/lib/cmake/Qgpgme", "lang/qt/src/QGpgmeConfig.cmake")
+    pisitools.insinto("/usr/lib/cmake/Qgpgme", "lang/qt/src/QGpgmeConfigVersion.cmake")
 
     pisitools.dodoc("AUTHORS", "ChangeLog", "NEWS", "README", "THANKS", "TODO")
diff --git a/util/crypt/gpgme/pspec.xml b/util/crypt/gpgme/pspec.xml
index 2253f53fd5..c45cda4b8f 100644
--- a/util/crypt/gpgme/pspec.xml
+++ b/util/crypt/gpgme/pspec.xml
@@ -13,20 +13,20 @@
         <IsA>library</IsA>
         <Summary>GnuPG Made Easy is a library for making GnuPG easier to use</Summary>
         <Description>GPGME is a library designed to make access to GnuPG easier for applications. It provides a high-Level Crypto application programming interface (API) for encryption, decryption, signing, signature verification and key management.</Description>
-        <Archive sha1sum="efa043064dbf675fd713228c6fcfcc4116feb221" type="tarbz2">http://gd.tuwien.ac.at/pub/gnupg/gpgme/gpgme-1.8.0.tar.bz2</Archive>
+        <Archive sha1sum="af95d75878200407eb577245eeb0681b1ad313ed" type="tarbz2">http://gd.tuwien.ac.at/pub/gnupg/gpgme/gpgme-1.7.1.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>gnupg</Dependency>
             <Dependency>libgpg-error-devel</Dependency>
             <Dependency>libassuan-devel</Dependency>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>doxygen</Dependency>
-            <Dependency>swig</Dependency>
+            <Dependency>swig</Dependency>            
             <Dependency>python3-devel</Dependency>
             <Dependency>python-devel</Dependency>
         </BuildDependencies>
-        <Patches>
+        <!--<Patches>
             <Patch level="1">remove-a-forgotten-instance-of-libsuffix.diff</Patch>
-        </Patches>
+        </Patches>-->
     </Source>
 
     <Package>
@@ -38,6 +38,7 @@
             <Dependency>libgcc</Dependency>
             <Dependency>qt5-base</Dependency>
             <Dependency>python3</Dependency>
+            <Dependency>python</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
@@ -63,16 +64,9 @@
         </Files>
     </Package>
 
-    <History>
-        <Update release="4">
-            <Date>2016-12-28</Date>
-            <Version>1.8.0</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Stefan Gronewold</Name>
-            <Email>groni@pisilinux.org</Email>
-        </Update>
+    <History>        
         <Update release="3">
-            <Date>2016-12-24</Date>
+            <Date>2017-01-02</Date>
             <Version>1.7.1</Version>
             <Comment>Version bump.</Comment>
             <Name>Stefan Gronewold</Name>