diff --git a/desktop/kde/applications/akonadi-contacts/pspec.xml b/desktop/kde/applications/akonadi-contacts/pspec.xml
index a1ba7658f9..c5cc51055f 100755
--- a/desktop/kde/applications/akonadi-contacts/pspec.xml
+++ b/desktop/kde/applications/akonadi-contacts/pspec.xml
@@ -13,7 +13,7 @@
         <IsA>app:console</IsA>
         <Summary>Libraries and daemons to implement Contact Management in Akonadi.</Summary>
         <Description>Libraries and daemons to implement Contact Management in Akonadi.</Description>
-        <Archive sha1sum="2607c230c0e2127df205f795f5603dd9e660e764" type="tarxz">mirrors://kde/stable/applications/18.12.3/src/akonadi-contacts-18.12.3.tar.xz</Archive>
+        <Archive sha1sum="993e160989d47b5afe576f954e80987f565ec5dc" type="tarxz">mirrors://kde/stable/applications/19.04.0/src/akonadi-contacts-19.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
             <Dependency versionFrom="5.7.1" >qt5-webengine-devel</Dependency>
@@ -91,6 +91,13 @@
     </Package>
 
     <History>
+        <Update release="24">
+            <Date>2019-04-18</Date>
+            <Version>19.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="23">
             <Date>2019-03-11</Date>
             <Version>18.12.3</Version>
diff --git a/desktop/kde/applications/akonadi-search/pspec.xml b/desktop/kde/applications/akonadi-search/pspec.xml
index 98bc9e5794..7982e092d7 100755
--- a/desktop/kde/applications/akonadi-search/pspec.xml
+++ b/desktop/kde/applications/akonadi-search/pspec.xml
@@ -13,7 +13,7 @@
         <IsA>library</IsA>
         <Summary>Libraries and daemons to implement searching in Akonadi</Summary>
         <Description>Libraries and daemons to implement searching in Akonadi</Description>
-        <Archive sha1sum="4d15fe0592c027d6e0f911585c8eac96367733c0" type="tarxz">mirrors://kde/stable/applications/18.12.3/src/akonadi-search-18.12.3.tar.xz</Archive>
+        <Archive sha1sum="f62b6f154738a01e412d14729f326ab97b1508fa" type="tarxz">mirrors://kde/stable/applications/19.04.0/src/akonadi-search-19.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
             <Dependency>kcrash-devel</Dependency>
@@ -109,6 +109,13 @@
     </Package>
 
     <History>
+        <Update release="26">
+            <Date>2019-04-18</Date>
+            <Version>19.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="25">
             <Date>2019-03-11</Date>
             <Version>18.12.3</Version>
diff --git a/desktop/kde/applications/dolphin-plugins/pspec.xml b/desktop/kde/applications/dolphin-plugins/pspec.xml
index 09bb446442..e2826bafd9 100755
--- a/desktop/kde/applications/dolphin-plugins/pspec.xml
+++ b/desktop/kde/applications/dolphin-plugins/pspec.xml
@@ -13,7 +13,7 @@
         <PartOf>desktop.kde.sdk</PartOf>
         <Summary>Extra dolphin plugins</Summary>
         <Description>This package contains plugins that offer integration in Dolphin with the following version control systems:</Description>
-        <Archive sha1sum="d27430a5938c115d7b05c644d0d2346da9694494" type="tarxz">mirrors://kde/stable/applications/18.12.3/src/dolphin-plugins-18.12.3.tar.xz</Archive>
+        <Archive sha1sum="3290b1528b192b29f0baef5a3b9ec2a85a8446ed" type="tarxz">mirrors://kde/stable/applications/19.04.0/src/dolphin-plugins-19.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
             <Dependency>kdoctools-devel</Dependency>
@@ -50,6 +50,13 @@
     </Package>
 
     <History>
+        <Update release="26">
+            <Date>2019-04-18</Date>
+            <Version>19.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="25">
             <Date>2019-03-11</Date>
             <Version>18.12.3</Version>
diff --git a/desktop/kde/applications/kalarmcal/pspec.xml b/desktop/kde/applications/kalarmcal/pspec.xml
index dc085d574d..c4a39d151a 100755
--- a/desktop/kde/applications/kalarmcal/pspec.xml
+++ b/desktop/kde/applications/kalarmcal/pspec.xml
@@ -13,7 +13,7 @@
         <IsA>app:console</IsA>
         <Summary>Library to provides access and handling of KAlarm calendar data</Summary>
         <Description>Library to provides access and handling of KAlarm calendar data</Description>
-        <Archive sha1sum="1679e36dfc634a010b909fd4f1ff8eda14fdd986" type="tarxz">mirrors://kde/stable/applications/18.12.3/src/kalarmcal-18.12.3.tar.xz</Archive>
+        <Archive sha1sum="e2f10dd9e7b41c58ae07fe6c7cf12a118a0fa000" type="tarxz">mirrors://kde/stable/applications/19.04.0/src/kalarmcal-19.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
             <Dependency>akonadi-devel</Dependency>
@@ -77,6 +77,13 @@
     </Package>
 
     <History>
+        <Update release="27">
+            <Date>2019-04-18</Date>
+            <Version>19.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="26">
             <Date>2019-03-11</Date>
             <Version>18.12.3</Version>
diff --git a/desktop/kde/applications/kcalutils/pspec.xml b/desktop/kde/applications/kcalutils/pspec.xml
index 2af3087539..88510fdbd9 100755
--- a/desktop/kde/applications/kcalutils/pspec.xml
+++ b/desktop/kde/applications/kcalutils/pspec.xml
@@ -13,7 +13,7 @@
         <IsA>app:library</IsA>
         <Summary>The KDE calendar utility library</Summary>
         <Description>Calendar utility library for KDE</Description>
-        <Archive sha1sum="aeed3b9ae654fe9933b59185918d80546f78024c" type="tarxz">mirrors://kde/stable/applications/18.12.3/src/kcalutils-18.12.3.tar.xz</Archive>
+        <Archive sha1sum="841285911356e1275a573741d6cbfe84cc1083a7" type="tarxz">mirrors://kde/stable/applications/19.04.0/src/kcalutils-19.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency >qt5-base-devel</Dependency>
             <Dependency >kcalcore-devel</Dependency>
@@ -78,6 +78,13 @@
     </Package>
 
     <History>
+        <Update release="28">
+            <Date>2019-04-18</Date>
+            <Version>19.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="27">
             <Date>2019-03-11</Date>
             <Version>18.12.3</Version>
diff --git a/desktop/kde/applications/kldap/pspec.xml b/desktop/kde/applications/kldap/pspec.xml
index 56a006588e..f4fe995276 100755
--- a/desktop/kde/applications/kldap/pspec.xml
+++ b/desktop/kde/applications/kldap/pspec.xml
@@ -13,7 +13,7 @@
         <IsA>app:console</IsA>
         <Summary>LDAP access API for KDE</Summary>
         <Description>Allows LDAP accessing with a convenient Qt style C++ API.</Description>
-        <Archive sha1sum="050ba9ef39578867c6b04ce8e84272aea7ded9bc" type="tarxz">mirrors://kde/stable/applications/18.12.3/src/kldap-18.12.3.tar.xz</Archive>
+        <Archive sha1sum="51f6c299ad05e5f285f6fbaccdc1667d8a6c3b41" type="tarxz">mirrors://kde/stable/applications/19.04.0/src/kldap-19.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
             <Dependency>kcompletion-devel</Dependency>
@@ -64,6 +64,13 @@
     </Package>
 
     <History>
+        <Update release="26">
+            <Date>2019-04-18</Date>
+            <Version>19.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="25">
             <Date>2019-03-11</Date>
             <Version>18.12.3</Version>
diff --git a/desktop/kde/applications/kmailtransport/pspec.xml b/desktop/kde/applications/kmailtransport/pspec.xml
index 25fb285604..a706dc216a 100755
--- a/desktop/kde/applications/kmailtransport/pspec.xml
+++ b/desktop/kde/applications/kmailtransport/pspec.xml
@@ -13,7 +13,7 @@
         <IsA>library</IsA>
         <Summary>Mail Transport Service</Summary>
         <Description>Mail Transport Service</Description>
-        <Archive sha1sum="af10be6b95ca8e8ef19655ba36afe8b2105ce43e" type="tarxz">mirrors://kde/stable/applications/18.12.3/src/kmailtransport-18.12.3.tar.xz</Archive>
+        <Archive sha1sum="151b71889a6feeb3fb710775aa798521b1bcac6c" type="tarxz">mirrors://kde/stable/applications/19.04.0/src/kmailtransport-19.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
 <!--             <Dependency>kdelibs4-support-devel</Dependency> -->
@@ -83,6 +83,13 @@
     </Package>
 
     <History>
+        <Update release="27">
+            <Date>2019-04-18</Date>
+            <Version>19.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="26">
             <Date>2019-03-11</Date>
             <Version>18.12.3</Version>
diff --git a/desktop/kde/applications/ktp-accounts-kcm/pspec.xml b/desktop/kde/applications/ktp-accounts-kcm/pspec.xml
index 06988b3ee2..d376eee591 100755
--- a/desktop/kde/applications/ktp-accounts-kcm/pspec.xml
+++ b/desktop/kde/applications/ktp-accounts-kcm/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>app</IsA>
         <Summary>KCM Module for configuring Telepathy Instant Messaging Accounts</Summary>
         <Description>KCM Module for configuring Telepathy Instant Messaging Accounts</Description>
-        <Archive sha1sum="1e6a456fc5ab90a30cb7093dad23af33d659b62e" type="tarxz">mirrors://kde/stable/applications/18.12.3/src/ktp-accounts-kcm-18.12.3.tar.xz</Archive>
+        <Archive sha1sum="ea9b4e84df14a5653ba7570e0ad62531f23d073f" type="tarxz">mirrors://kde/stable/applications/19.04.0/src/ktp-accounts-kcm-19.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>extra-cmake-modules</Dependency>
             <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
@@ -75,6 +75,13 @@
     </Package>
 
     <History>
+        <Update release="26">
+            <Date>2019-04-18</Date>
+            <Version>19.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="25">
             <Date>2019-03-11</Date>
             <Version>18.12.3</Version>
diff --git a/desktop/kde/applications/ktp-auth-handler/pspec.xml b/desktop/kde/applications/ktp-auth-handler/pspec.xml
index f7d45519e3..51cd2fc626 100755
--- a/desktop/kde/applications/ktp-auth-handler/pspec.xml
+++ b/desktop/kde/applications/ktp-auth-handler/pspec.xml
@@ -13,7 +13,7 @@
         <PartOf>desktop.kde.network</PartOf>
         <Summary>Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect</Summary>
         <Description>Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect</Description>
-        <Archive type="tarxz" sha1sum="d05a6288b884a55affbd4dcd4ff28fee62fe05a9">mirrors://kde/stable/applications/18.12.3/src/ktp-auth-handler-18.12.3.tar.xz</Archive>
+        <Archive type="tarxz" sha1sum="453bac5b2a9ba39ece01dd0b88b8e3a7ef24af4d">mirrors://kde/stable/applications/19.04.0/src/ktp-auth-handler-19.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>extra-cmake-modules</Dependency>
             <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
@@ -61,6 +61,13 @@
     </Package>
 
     <History>
+        <Update release="26">
+            <Date>2019-04-18</Date>
+            <Version>19.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="25">
             <Date>2019-03-11</Date>
             <Version>18.12.3</Version>
diff --git a/desktop/kde/applications/ktp-contact-list/pspec.xml b/desktop/kde/applications/ktp-contact-list/pspec.xml
index f4fa7f26d3..45f32dbc48 100755
--- a/desktop/kde/applications/ktp-contact-list/pspec.xml
+++ b/desktop/kde/applications/ktp-contact-list/pspec.xml
@@ -11,7 +11,7 @@
         <PartOf>desktop.kde.network</PartOf>
         <Summary>KDE Telepathy contact list application</Summary>
         <Description>KDE Telepathy contact list application</Description>
-       <Archive type="tarxz" sha1sum="6077811525c2b33dc2e88b70630615756c7a6783">mirrors://kde/stable/applications/18.12.3/src/ktp-contact-list-18.12.3.tar.xz</Archive>
+       <Archive type="tarxz" sha1sum="0106d25fae325a646271d72d6f4f67fec109011d">mirrors://kde/stable/applications/19.04.0/src/ktp-contact-list-19.04.0.tar.xz</Archive>
        <BuildDependencies>
             <Dependency>extra-cmake-modules</Dependency>
             <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
@@ -63,6 +63,13 @@
     </Package>
 
     <History>
+        <Update release="17">
+            <Date>2019-04-18</Date>
+            <Version>19.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="16">
             <Date>2019-03-11</Date>
             <Version>18.12.3</Version>
diff --git a/desktop/kde/applications/ktp-contact-runner/pspec.xml b/desktop/kde/applications/ktp-contact-runner/pspec.xml
index 4580d82285..d104ee6c62 100755
--- a/desktop/kde/applications/ktp-contact-runner/pspec.xml
+++ b/desktop/kde/applications/ktp-contact-runner/pspec.xml
@@ -11,7 +11,7 @@
         <PartOf>desktop.kde.network</PartOf>
         <Summary> 	KRunner plugin for KDE Telepathy</Summary>
         <Description>KRunner plugin for KDE Telepathy</Description>
-        <Archive type="tarxz" sha1sum="42ce26a810844da1b6886160acd63c75810de26b">mirrors://kde/stable/applications/18.12.3/src/ktp-contact-runner-18.12.3.tar.xz</Archive>
+        <Archive type="tarxz" sha1sum="1afcc6a2dea57fb4e2328a78c1728cbbc6964879">mirrors://kde/stable/applications/19.04.0/src/ktp-contact-runner-19.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>extra-cmake-modules</Dependency>
             <Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
@@ -45,6 +45,13 @@
     </Package>
 
     <History>
+        <Update release="26">
+            <Date>2019-04-18</Date>
+            <Version>19.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="25">
             <Date>2019-03-11</Date>
             <Version>18.12.3</Version>
diff --git a/desktop/kde/applications/ktp-filetransfer-handler/pspec.xml b/desktop/kde/applications/ktp-filetransfer-handler/pspec.xml
index 8749f4a17e..a6cc8770a0 100755
--- a/desktop/kde/applications/ktp-filetransfer-handler/pspec.xml
+++ b/desktop/kde/applications/ktp-filetransfer-handler/pspec.xml
@@ -11,7 +11,7 @@
         <PartOf>desktop.kde.network</PartOf>
         <Summary>KDE Telepathy file transfer handler</Summary>
         <Description>KDE Telepathy file transfer handler</Description>
- <Archive sha1sum="e95986c9686ef2d5e10a7a688f494d98662a9c72" type="tarxz">mirrors://kde/stable/applications/18.12.3/src/ktp-filetransfer-handler-18.12.3.tar.xz</Archive>
+ <Archive sha1sum="79b73880921206dce89543c46686174b2f22e010" type="tarxz">mirrors://kde/stable/applications/19.04.0/src/ktp-filetransfer-handler-19.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>extra-cmake-modules</Dependency>
             <Dependency>kcoreaddons-devel</Dependency>
@@ -47,6 +47,13 @@
     </Package>
 
     <History>
+        <Update release="26">
+            <Date>2019-04-18</Date>
+            <Version>19.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="25">
             <Date>2019-03-11</Date>
             <Version>18.12.3</Version>
diff --git a/desktop/kde/applications/ktp-kded-module/pspec.xml b/desktop/kde/applications/ktp-kded-module/pspec.xml
index 0c7374d3e3..d441335107 100755
--- a/desktop/kde/applications/ktp-kded-module/pspec.xml
+++ b/desktop/kde/applications/ktp-kded-module/pspec.xml
@@ -32,7 +32,7 @@
             <Dependency>telepathy-logger-qt-devel</Dependency>
             <Dependency>telepathy-qt5-devel</Dependency>
         </BuildDependencies>
-        <Archive type="tarxz" sha1sum="72e2e6b36323667d2448bc8a4818d22c46598c71">mirrors://kde/stable/applications/18.12.3/src/ktp-kded-module-18.12.3.tar.xz</Archive>
+        <Archive type="tarxz" sha1sum="cff0d3f26ccbfdd71ea48de3b2e03d161f0cd624">mirrors://kde/stable/applications/19.04.0/src/ktp-kded-module-19.04.0.tar.xz</Archive>
     </Source>
     
     <Package>
@@ -63,6 +63,13 @@
     </Package>
     
     <History>
+        <Update release="26">
+            <Date>2019-04-18</Date>
+            <Version>19.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="25">
             <Date>2019-03-11</Date>
             <Version>18.12.3</Version>
diff --git a/desktop/kde/applications/ktp-send-file/pspec.xml b/desktop/kde/applications/ktp-send-file/pspec.xml
index 5fee4c23ae..e8ba5bd214 100755
--- a/desktop/kde/applications/ktp-send-file/pspec.xml
+++ b/desktop/kde/applications/ktp-send-file/pspec.xml
@@ -22,7 +22,7 @@
             <Dependency>telepathy-logger-qt-devel</Dependency>
             <Dependency>telepathy-qt5-devel</Dependency>
         </BuildDependencies>
-        <Archive sha1sum="7938bdf88f61b70138839df1085e81ea7b81747f" type="tarxz">mirrors://kde/stable/applications/18.12.3/src/ktp-send-file-18.12.3.tar.xz</Archive>
+        <Archive sha1sum="a829991434fd3307ad796e810fe0a3ef888ec677" type="tarxz">mirrors://kde/stable/applications/19.04.0/src/ktp-send-file-19.04.0.tar.xz</Archive>
     </Source>
     
     <Package>
@@ -49,6 +49,13 @@
     </Package>
     
     <History>
+        <Update release="26">
+            <Date>2019-04-18</Date>
+            <Version>19.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="25">
             <Date>2019-03-11</Date>
             <Version>18.12.3</Version>
diff --git a/desktop/kde/applications/ktp-text-ui/pspec.xml b/desktop/kde/applications/ktp-text-ui/pspec.xml
index 4b6f9fe9ca..65352e9bb0 100755
--- a/desktop/kde/applications/ktp-text-ui/pspec.xml
+++ b/desktop/kde/applications/ktp-text-ui/pspec.xml
@@ -13,7 +13,7 @@
         <PartOf>desktop.kde.network</PartOf>
         <Summary>Telepathy handler for Text Chats</Summary>
         <Description>Telepathy handler for Text Chats</Description>
-        <Archive sha1sum="a6291395b08f3c47ba7a31f8b7d605efd706fc83" type="tarxz">mirrors://kde/stable/applications/18.12.3/src/ktp-text-ui-18.12.3.tar.xz</Archive>
+        <Archive sha1sum="375e87ddb80fc0ee19dab3b2be34942c3986d733" type="tarxz">mirrors://kde/stable/applications/19.04.0/src/ktp-text-ui-19.04.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>extra-cmake-modules</Dependency>
             <Dependency>karchive-devel</Dependency>
@@ -96,6 +96,13 @@
     </Package>
 
     <History>
+        <Update release="26">
+            <Date>2019-04-18</Date>
+            <Version>19.04.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="25">
             <Date>2019-03-11</Date>
             <Version>18.12.3</Version>
diff --git a/util/misc/tidy/actions.py b/util/misc/tidy/actions.py
index 2ed82d1155..0a83a362fa 100644
--- a/util/misc/tidy/actions.py
+++ b/util/misc/tidy/actions.py
@@ -4,22 +4,26 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file http://www.gnu.org/licenses/gpl.txt
 
-from pisi.actionsapi import autotools
 from pisi.actionsapi import shelltools
+from pisi.actionsapi import cmaketools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
-#WorkDir = "tidy-%s" % get.srcVERSION().split("_", 1)[1]
-
 def setup():
-    #shelltools.system("sh build/gnuauto/setup.sh")
-    autotools.configure("--disable-static")
-                         #--includedir=%s/usr/include/" % get.installDIR())
+    shelltools.makedirs("build")
+    shelltools.cd("build")
+    cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
+                          -DBUILD_TAB2SPACE=ON \
+                          -DCMAKE_BUILD_TYPE=Release", sourceDir="..")
 
 def build():
-    autotools.make()
+    shelltools.cd("build")
+    cmaketools.make()
+    
 
 def install():
-    autotools.install()
-
-    #pisitools.dodoc("readme.txt")
+    shelltools.cd("build")
+    cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
+    
+    shelltools.cd("..")
+    pisitools.dodoc("README.md")
diff --git a/util/misc/tidy/pspec.xml b/util/misc/tidy/pspec.xml
index 18f276c6be..cbe3c567e1 100644
--- a/util/misc/tidy/pspec.xml
+++ b/util/misc/tidy/pspec.xml
@@ -12,7 +12,11 @@
         <IsA>app:console</IsA>
         <Summary>HTML and XML error checking</Summary>
         <Description>tidy, as the name suggests, tidies the layout of and corrects errors in HTML and XML documents.</Description>
-        <Archive sha1sum="3688e2cc254e7ee49756def8cd5b1c91721edc00" type="tarbz2">http://anduin.linuxfromscratch.org/sources/BLFS/svn/t/tidy-cvs_20101110.tar.bz2</Archive>
+        <Archive sha1sum="bd6812f3493095c4ca42be11fe3884d1da11c361" type="targz">https://github.com/htacg/tidy-html5/archive/5.6.0/tidy-html5-5.6.0.tar.gz</Archive>
+        <BuildDependencies>
+            <Dependency>cmake</Dependency>
+            <Dependency>libxslt-devel</Dependency>
+        </BuildDependencies>
     </Source>
 
     <Package>
@@ -21,6 +25,7 @@
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="man">/usr/share/man</Path>
         </Files>
     </Package>
 
@@ -32,10 +37,18 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
+            <Path fileType="library">/usr/lib/pkgconfig</Path>
         </Files>
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2019-04-18</Date>
+            <Version>5.6.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2018-08-10</Date>
             <Version>20101110</Version>