diff --git a/desktop/kde/applications/akonadi-calendar-tools/actions.py b/desktop/kde/applications/akonadi-calendar-tools/actions.py
index c08560359e..83172376f4 100755
--- a/desktop/kde/applications/akonadi-calendar-tools/actions.py
+++ b/desktop/kde/applications/akonadi-calendar-tools/actions.py
@@ -17,5 +17,5 @@ def install():
     kde5.install()
 
 
-    #pisitools.dodoc("COPYING.DOC", "COPYING.LIB",  "COPYING")
+    pisitools.dodoc("LICENSES/*")
 
diff --git a/desktop/kde/applications/akonadi-calendar-tools/pspec.xml b/desktop/kde/applications/akonadi-calendar-tools/pspec.xml
index 6d33e8df33..a2bdef6e5f 100755
--- a/desktop/kde/applications/akonadi-calendar-tools/pspec.xml
+++ b/desktop/kde/applications/akonadi-calendar-tools/pspec.xml
@@ -11,7 +11,7 @@
         <License>GPLv2</License>
         <Summary>CLI tools to manage akonadi calendars</Summary>
         <Description>CLI tools to manage akonadi calendars</Description>
-        <Archive sha1sum="ec6efdcd9023011df7c47b746a8ceca09e28591a" type="tarxz">http://download.kde.org/stable/release-service/20.12.3/src/akonadi-calendar-tools-20.12.3.tar.xz</Archive>
+        <Archive sha1sum="4cddae0a8ef0d020be96fc01f16054bd05c6a8d0" type="tarxz">http://download.kde.org/stable/release-service/21.04.0/src/akonadi-calendar-tools-21.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>boost-devel</Dependency>
             <Dependency>akonadi-devel</Dependency>
@@ -68,6 +68,13 @@
     </Package>
 
     <History>
+        <Update release="28">
+            <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="27">
             <Date>2021-03-10</Date>
             <Version>20.12.3</Version>
diff --git a/desktop/kde/applications/akonadiconsole/pspec.xml b/desktop/kde/applications/akonadiconsole/pspec.xml
index a248f9787e..4825766600 100755
--- a/desktop/kde/applications/akonadiconsole/pspec.xml
+++ b/desktop/kde/applications/akonadiconsole/pspec.xml
@@ -9,7 +9,7 @@
         <License>GPLv2</License>
         <Summary>Akonadi management and debugging console</Summary>
         <Description>Akonadi management and debugging console</Description>
-        <Archive type="tarxz" sha1sum="e3ae24663cfa91d0030cba54a2d3f6e6b5a0d005">http://download.kde.org/stable/release-service/20.12.3/src/akonadiconsole-20.12.3.tar.xz</Archive>
+        <Archive type="tarxz" sha1sum="564b51b51e2afefdc6cd790809734efc1e58ffdc">http://download.kde.org/stable/release-service/21.04.0/src/akonadiconsole-21.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>akonadi-contacts-devel</Dependency>
             <Dependency>akonadi-devel</Dependency>
@@ -96,6 +96,13 @@
     </Package>
 
     <History>
+        <Update release="27">
+            <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="26">
             <Date>2021-03-10</Date>
             <Version>20.12.3</Version>
diff --git a/desktop/kde/applications/akregator/actions.py b/desktop/kde/applications/akregator/actions.py
index bf84e0d39a..d96f7b6a6e 100755
--- a/desktop/kde/applications/akregator/actions.py
+++ b/desktop/kde/applications/akregator/actions.py
@@ -17,5 +17,5 @@ def install():
     kde5.install()
 
 
-    pisitools.dodoc("AUTHORS", "LICENSES/*", "ChangeLog", "README")
+    pisitools.dodoc("LICENSES/*", "README*")
 
diff --git a/desktop/kde/applications/akregator/pspec.xml b/desktop/kde/applications/akregator/pspec.xml
index 513254b075..112db4588b 100755
--- a/desktop/kde/applications/akregator/pspec.xml
+++ b/desktop/kde/applications/akregator/pspec.xml
@@ -11,7 +11,7 @@
         <License>GPLv2</License>
         <Summary>A KDE blogging client</Summary>
         <Description>Akregator helps you to keep informed about new stories on websites like KDE Dot News and Planet KDE blogs. The technology used is RSS and many sites support it.</Description>
-        <Archive sha1sum="ccd7d7ba3fe7a848f8ac7f40bb95fe28395d181f" type="tarxz">http://download.kde.org/stable/release-service/20.12.3/src/akregator-20.12.3.tar.xz</Archive>
+        <Archive sha1sum="b2b54aa43184e5971421ffe1929adf08c61a5ad5" type="tarxz">http://download.kde.org/stable/release-service/21.04.0/src/akregator-21.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>boost-devel</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
@@ -96,6 +96,13 @@
     </Package>
 
     <History>
+        <Update release="28">
+            <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="27">
             <Date>2021-03-10</Date>
             <Version>20.12.3</Version>
diff --git a/desktop/kde/applications/eventviews/actions.py b/desktop/kde/applications/eventviews/actions.py
index c0f57a3afd..9adb1281fa 100755
--- a/desktop/kde/applications/eventviews/actions.py
+++ b/desktop/kde/applications/eventviews/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/eventviews/pspec.xml b/desktop/kde/applications/eventviews/pspec.xml
index 26a25fc2b0..4e8955e215 100755
--- a/desktop/kde/applications/eventviews/pspec.xml
+++ b/desktop/kde/applications/eventviews/pspec.xml
@@ -10,7 +10,7 @@
         <IsA>app:console</IsA>
         <Summary>Library for creating events.</Summary>
         <Description>Library for creating events.</Description>
-        <Archive type="tarxz" sha1sum="d0963e3aab93f73ed4bf8bb5a44258b6ad3f968d">mirrors://kde/stable/release-service/20.12.3/src/eventviews-20.12.3.tar.xz</Archive>
+        <Archive type="tarxz" sha1sum="1b2d222e2954eee8f279c05b3d94ee860762b972">mirrors://kde/stable/release-service/21.04.0/src/eventviews-21.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>extra-cmake-modules</Dependency>
             <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
@@ -82,6 +82,7 @@
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="library">/usr/lib/qt5</Path>
             <Path fileType="data">/usr/share</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="data">/usr/share/kservicetypes5</Path>
             <Path fileType="localedata">/usr/share/locale</Path>
         </Files>
@@ -100,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/grantlee-editor/pspec.xml b/desktop/kde/applications/grantlee-editor/pspec.xml
index 3e53a2b8ab..7cff310384 100755
--- a/desktop/kde/applications/grantlee-editor/pspec.xml
+++ b/desktop/kde/applications/grantlee-editor/pspec.xml
@@ -11,7 +11,7 @@
         <License>GPLv2</License>
         <Summary>Editor for Grantlee themes</Summary>
         <Description>Editor for Grantlee themes</Description>
-        <Archive sha1sum="f506fa8f8c9fbbdf20efc7dea046bda287e081da" type="tarxz">mirrors://kde/stable/release-service/20.12.3/src/grantlee-editor-20.12.3.tar.xz</Archive>
+        <Archive sha1sum="0f7acaefa951c26c4e8c87fa326c65321488847d" type="tarxz">mirrors://kde/stable/release-service/21.04.0/src/grantlee-editor-21.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-webengine-devel</Dependency>
             <Dependency>kcrash-devel</Dependency>
@@ -87,6 +87,13 @@
     </Package>
 
     <History>
+        <Update release="27">
+            <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="26">
             <Date>2021-03-10</Date>
             <Version>20.12.3</Version>
diff --git a/desktop/kde/applications/incidenceeditor/actions.py b/desktop/kde/applications/incidenceeditor/actions.py
index c0f57a3afd..9adb1281fa 100755
--- a/desktop/kde/applications/incidenceeditor/actions.py
+++ b/desktop/kde/applications/incidenceeditor/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/incidenceeditor/pspec.xml b/desktop/kde/applications/incidenceeditor/pspec.xml
index 015066ebf6..6077db744c 100755
--- a/desktop/kde/applications/incidenceeditor/pspec.xml
+++ b/desktop/kde/applications/incidenceeditor/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>app:console</IsA>
         <Summary>KDE PIM incidence editor.</Summary>
         <Description>KDE PIM incidence editor.</Description>
-        <Archive sha1sum="f28e50fc4fecfbbbb0d22bbf06da4564c9209ad2" type="tarxz">http://download.kde.org/stable/release-service/20.12.3/src/incidenceeditor-20.12.3.tar.xz</Archive>
+        <Archive sha1sum="cce781ea64eb59c4a8ed5408f20ca5c759a3143e" type="tarxz">http://download.kde.org/stable/release-service/21.04.0/src/incidenceeditor-21.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>extra-cmake-modules</Dependency>
             <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
@@ -101,6 +101,7 @@
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="library">/usr/lib/qt5</Path>
             <Path fileType="data">/usr/share</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="localedata">/usr/share/locale</Path>
         </Files>
     </Package>
@@ -119,6 +120,13 @@
     </Package>
 
     <History>
+        <Update release="36">
+            <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="35">
             <Date>2021-03-10</Date>
             <Version>20.12.3</Version>
diff --git a/desktop/kde/applications/mailcommon/actions.py b/desktop/kde/applications/mailcommon/actions.py
index b0e6d2d3a2..b9a54dff81 100755
--- a/desktop/kde/applications/mailcommon/actions.py
+++ b/desktop/kde/applications/mailcommon/actions.py
@@ -16,3 +16,5 @@ def build():
 def install():
     kde5.install()
 
+    pisitools.dodoc("LICENSES/*")
+
diff --git a/desktop/kde/applications/mailcommon/pspec.xml b/desktop/kde/applications/mailcommon/pspec.xml
index d8ce326908..a7b1b697a0 100755
--- a/desktop/kde/applications/mailcommon/pspec.xml
+++ b/desktop/kde/applications/mailcommon/pspec.xml
@@ -13,7 +13,7 @@
         <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="2965dca5a32f08819091aa76e53dcc00d601f265" type="tarxz">mirrors://kde/stable/release-service/20.12.3/src/mailcommon-20.12.3.tar.xz</Archive>
+        <Archive sha1sum="b701a36edf880085647ac5b4da372624f2c82c82" type="tarxz">mirrors://kde/stable/release-service/21.04.0/src/mailcommon-21.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>qt5-phonon-devel</Dependency>
@@ -122,6 +122,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>