diff --git a/desktop/kde/applications/calendarsupport/actions.py b/desktop/kde/applications/calendarsupport/actions.py
index 8f488e2cda..9adb1281fa 100755
--- a/desktop/kde/applications/calendarsupport/actions.py
+++ b/desktop/kde/applications/calendarsupport/actions.py
@@ -14,3 +14,5 @@ def build():
 
 def install():
     kde5.install()
+
+    pisitools.dodoc("LICENSES/*")
diff --git a/desktop/kde/applications/calendarsupport/pspec.xml b/desktop/kde/applications/calendarsupport/pspec.xml
index 31c8a3a56a..55dd904086 100755
--- a/desktop/kde/applications/calendarsupport/pspec.xml
+++ b/desktop/kde/applications/calendarsupport/pspec.xml
@@ -10,7 +10,7 @@
         <IsA>app:console</IsA>
         <Summary>Calendar support library</Summary>
         <Description>Calendar support library</Description>
-        <Archive type="tarxz" sha1sum="98eb975dbe924820bbf45161797db683c7f5615e">mirrors://kde/stable/release-service/20.12.3/src/calendarsupport-20.12.3.tar.xz</Archive>
+        <Archive type="tarxz" sha1sum="e64260fae9bafcdb611d3873b6da2b3a533ff2a0">mirrors://kde/stable/release-service/21.04.0/src/calendarsupport-21.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>extra-cmake-modules</Dependency>
             <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
@@ -101,6 +101,13 @@
     </Package>
 
     <History>
+        <Update release="35">
+            <Date>2021-05-09</Date>
+            <Version>21.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="34">
             <Date>2021-03-10</Date>
             <Version>20.12.3</Version>
diff --git a/desktop/kde/applications/kdepim-runtime/actions.py b/desktop/kde/applications/kdepim-runtime/actions.py
index 59e83cc850..323dde2c98 100755
--- a/desktop/kde/applications/kdepim-runtime/actions.py
+++ b/desktop/kde/applications/kdepim-runtime/actions.py
@@ -13,4 +13,6 @@ def build():
     kde5.make()
 
 def install():
-    kde5.install()
\ No newline at end of file
+    kde5.install()
+
+    pisitools.dodoc("LICENSES/*")
diff --git a/desktop/kde/applications/kdepim-runtime/pspec.xml b/desktop/kde/applications/kdepim-runtime/pspec.xml
index 1601fffa69..414a5a4bfa 100755
--- a/desktop/kde/applications/kdepim-runtime/pspec.xml
+++ b/desktop/kde/applications/kdepim-runtime/pspec.xml
@@ -14,7 +14,7 @@
         <IsA>app:gui</IsA>
         <Summary>KDE5 PIM Runtime Environment</Summary>
         <Description>kdepim-runtime contains KDE5 PIM (Personal Information Management) runtime environment like akonadi agents.</Description>
-        <Archive sha1sum="e4169daa62ad9f78ce402d31582285a3a47c80ee" type="tarxz">mirrors://kde/stable/release-service/20.12.3/src/kdepim-runtime-20.12.3.tar.xz</Archive>
+        <Archive sha1sum="c7b71a408c92b70b4d3ed1524e89bffd74c46fd6" type="tarxz">mirrors://kde/stable/release-service/21.04.0/src/kdepim-runtime-21.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>kdoctools-devel</Dependency>
             <Dependency>boost-devel</Dependency>
@@ -138,6 +138,13 @@
     </Package>
 
     <History>
+        <Update release="35">
+            <Date>2021-05-09</Date>
+            <Version>21.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="34">
             <Date>2021-03-10</Date>
             <Version>20.12.3</Version>
diff --git a/desktop/kde/applications/messagelib/actions.py b/desktop/kde/applications/messagelib/actions.py
index d884637ca3..5720de3203 100755
--- a/desktop/kde/applications/messagelib/actions.py
+++ b/desktop/kde/applications/messagelib/actions.py
@@ -18,3 +18,5 @@ def build():
 def install():
     kde5.install()
 
+    pisitools.dodoc("LICENSES/*")
+
diff --git a/desktop/kde/applications/messagelib/pspec.xml b/desktop/kde/applications/messagelib/pspec.xml
index aad8d38970..46cbb124c9 100755
--- a/desktop/kde/applications/messagelib/pspec.xml
+++ b/desktop/kde/applications/messagelib/pspec.xml
@@ -13,19 +13,19 @@
         <IsA>app:library</IsA>
         <Summary>KDE PIM library providing support for mail applications</Summary>
         <Description>KDE PIM library providing support for mail applications</Description>
-        <Archive sha1sum="646cb85939ed3018c6b9a2bc580ecd320046cceb" type="tarxz">mirrors://kde/stable/release-service/20.12.3/src/messagelib-20.12.3.tar.xz</Archive>
+        <Archive sha1sum="64e7ddf29a1deaf8de9ff2c09bb84b5e9c520dc7" type="tarxz">mirrors://kde/stable/release-service/21.04.0/src/messagelib-21.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
             <Dependency>boost-devel</Dependency>
             <Dependency>kdoctools-devel</Dependency>
-            <Dependency versionFrom="20.12.3">mailimporter-devel</Dependency>
-            <Dependency versionFrom="20.12.3">libgravatar-devel</Dependency>
+            <Dependency versionFrom="21.04.0">mailimporter-devel</Dependency>
+            <Dependency versionFrom="21.04.0">libgravatar-devel</Dependency>
             <!--Dependency versionFrom="20.12.3">kdepim-apps-libs-devel</Dependency-->
-            <Dependency versionFrom="20.12.3">kidentitymanagement-devel</Dependency>
-            <Dependency versionFrom="20.12.3">kmailtransport-devel</Dependency>
-            <Dependency versionFrom="20.12.3">kmbox-devel</Dependency>
-            <Dependency versionFrom="20.12.3">akonadi-devel</Dependency>
+            <Dependency versionFrom="21.04.0">kidentitymanagement-devel</Dependency>
+            <Dependency versionFrom="21.04.0">kmailtransport-devel</Dependency>
+            <Dependency versionFrom="21.04.0">kmbox-devel</Dependency>
+            <Dependency versionFrom="21.04.0">akonadi-devel</Dependency>
             <Dependency>solid-devel</Dependency>
             <Dependency>kguiaddons-devel</Dependency>
             <Dependency>kitemmodels-devel</Dependency>
@@ -34,29 +34,29 @@
             <Dependency>kemoticons-devel</Dependency>
             <Dependency>kinit-devel</Dependency>
             <Dependency >kunitconversion-devel</Dependency>
-            <Dependency versionFrom="20.12.3">kmime-devel</Dependency>
+            <Dependency versionFrom="21.04.0">kmime-devel</Dependency>
             <Dependency versionFrom="5.66.0">kcontacts-devel</Dependency>
             <Dependency versionFrom="5.66.0">kcalendarcore-devel</Dependency>
             <Dependency>kdewebkit-devel</Dependency>
-            <Dependency versionFrom="20.12.3">akonadi-calendar-devel</Dependency>
-            <Dependency versionFrom="20.12.3">akonadi-search-devel</Dependency>
+            <Dependency versionFrom="21.04.0">akonadi-calendar-devel</Dependency>
+            <Dependency versionFrom="21.04.0">akonadi-search-devel</Dependency>
             <Dependency>syntax-highlighting-devel</Dependency>
-            <Dependency versionFrom="20.12.3">kpimtextedit-devel</Dependency>
-            <Dependency versionFrom="20.12.3">kimap-devel</Dependency>
-            <Dependency versionFrom="20.12.3">kldap-devel</Dependency>
-            <Dependency versionFrom="20.12.3">grantleetheme-devel</Dependency>
-            <Dependency versionFrom="20.12.3">pimcommon-devel</Dependency>
-            <Dependency versionFrom="20.12.3">libkleo-devel</Dependency>
-            <Dependency versionFrom="20.12.3">libkdepim-devel</Dependency>
+            <Dependency versionFrom="21.04.0">kpimtextedit-devel</Dependency>
+            <Dependency versionFrom="21.04.0">kimap-devel</Dependency>
+            <Dependency versionFrom="21.04.0">kldap-devel</Dependency>
+            <Dependency versionFrom="21.04.0">grantleetheme-devel</Dependency>
+            <Dependency versionFrom="21.04.0">pimcommon-devel</Dependency>
+            <Dependency versionFrom="21.04.0">libkleo-devel</Dependency>
+            <Dependency versionFrom="21.04.0">libkdepim-devel</Dependency>
             <Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
             <Dependency versionFrom="1.7.1">gpgme-qt5-devel</Dependency>
             <Dependency>grantlee-qt5-devel</Dependency>
             <Dependency>qt5-declarative-devel</Dependency>
             <Dependency>qt5-webengine-devel</Dependency>
             <Dependency>qca2-qt5-devel</Dependency>
-            <Dependency versionFrom="20.12.3">akonadi-notes-devel</Dependency>
-            <Dependency versionFrom="20.12.3">akonadi-mime-devel</Dependency>
-            <Dependency versionFrom="20.12.3">akonadi-contacts-devel</Dependency>
+            <Dependency versionFrom="21.04.0">akonadi-notes-devel</Dependency>
+            <Dependency versionFrom="21.04.0">akonadi-mime-devel</Dependency>
+            <Dependency versionFrom="21.04.0">akonadi-contacts-devel</Dependency>
             <Dependency versionFrom="2.4.41">openldap-client</Dependency>
             <Dependency versionFrom="2.1.26">cyrus-sasl-devel</Dependency>
             <Dependency versionFrom="5.39.0">karchive-devel</Dependency>
@@ -157,6 +157,13 @@
     </Package>
 
     <History>
+        <Update release="33">
+            <Date>2021-05-09</Date>
+            <Version>21.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="32">
             <Date>2021-03-10</Date>
             <Version>20.12.3</Version>