diff --git a/kdeapps.conf b/kdeapps.conf
index 6f9733a80..7b950a12b 100644
--- a/kdeapps.conf
+++ b/kdeapps.conf
@@ -19,4 +19,4 @@ _mirror="http://download.kde.org/stable/applications/${_kdever}/src"
 _oldkdever="4.14.3"
 _workspace_ver="4.11.22"
 _libsver="4.14.38"
-_kdevver='5.2.1'
+_kdevver='5.2.4'
diff --git a/kdev-php/PKGBUILD b/kdev-php/PKGBUILD
index ea1e49632..55edfae8a 100644
--- a/kdev-php/PKGBUILD
+++ b/kdev-php/PKGBUILD
@@ -21,7 +21,14 @@ prepare() {
 
 build() {
   cd build
-  cmake_kf5 ../${pkgname}-${pkgver}
+  cmake  ../${pkgname}-${pkgver} \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DKDE_INSTALL_LIBDIR=lib \
+        -DKDE_INSTALL_SYSCONFDIR=/etc \
+        -DKDE_INSTALL_LIBEXECDIR=lib \
+        -DBUILD_TESTING=OFF \
+        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
   make
 }
 
diff --git a/kdev-python/PKGBUILD b/kdev-python/PKGBUILD
index a1f3fc4dd..9e3a1a8aa 100644
--- a/kdev-python/PKGBUILD
+++ b/kdev-python/PKGBUILD
@@ -3,7 +3,7 @@ source ../kdeapps.conf
 
 pkgname=kdev-python
 pkgver=$_kdevver
-pkgrel=2
+pkgrel=1
 pkgdesc="Python language and documentation plugin for KDevelop"
 arch=('x86_64')
 url="http://www.kdevelop.org/"
@@ -21,7 +21,14 @@ prepare() {
 
 build() {
   cd build
-  cmake_kf5 ../${pkgname}-$pkgver
+  cmake  ../${pkgname}-${pkgver} \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DKDE_INSTALL_LIBDIR=lib \
+        -DKDE_INSTALL_SYSCONFDIR=/etc \
+        -DKDE_INSTALL_LIBEXECDIR=lib \
+        -DBUILD_TESTING=OFF \
+        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
   make
 }
 
diff --git a/kdevelop.checksums b/kdevelop.checksums
index 01b71a01c..0eeb56516 100644
--- a/kdevelop.checksums
+++ b/kdevelop.checksums
@@ -1,3 +1,3 @@
-d1c39c563e4fada89eb9f30bd43c6c4beed0fec7ca7d124af587193cfe020650  kdevelop-5.2.1.tar.xz
-0bbe4f22e52cd734d8f603ab7e6cd93024a1fcb3f3061423603554664bb25b75  kdev-php-5.2.1.tar.xz
-32d663e593ac8c538c101742b2ee838256a7794914d8e0a047ce0d28bafa027b  kdev-python-5.2.1.tar.xz
+47891ab1b8dfc0a686ff37435e7781eebf2236bf8b52d85987cfbba618bf454a  kdev-php-5.2.4.tar.xz
+45394fac8fd6cef6d5dfd310afb6184f71660dbcffeaa7de121f04da2e293eba  kdev-python-5.2.4.tar.xz
+2c3ee424da6b0df06bea48db28abb9a00be9601a5494f026f9cbe704edd173c9  kdevelop-5.2.4.tar.xz
diff --git a/kdevelop.order b/kdevelop.order
index 547e31c1e..ca009527a 100644
--- a/kdevelop.order
+++ b/kdevelop.order
@@ -2,3 +2,4 @@
 kdevelop
 kdev-python
 kdev-php
+kdevelop-clang-tidy
diff --git a/kdevelop/PKGBUILD b/kdevelop/PKGBUILD
index d9562aadf..40902431a 100644
--- a/kdevelop/PKGBUILD
+++ b/kdevelop/PKGBUILD
@@ -3,13 +3,14 @@ source ../kdeapps.conf
 
 pkgname=kdevelop
 pkgver=$_kdevver
-pkgrel=3
+pkgrel=1
 pkgdesc='A C/C++ development environment for KDE'
 arch=(x86_64)
 url='http://www.kdevelop.org/'
 license=(GPL)
-option=('debug')
-depends=(clang libksysguard kitemmodels knotifyconfig ktexteditor grantlee libkomparediff2 qt5-webengine)
+options=('debug')
+depends=(clang libksysguard kitemmodels knotifyconfig ktexteditor grantlee libkomparediff2 qt5-webengine
+         kcmutils threadweaver knewstuff)
 makedepends=(extra-cmake-modules kdoctools kdevelop-pg-qt llvm qt5-tools plasma-framework krunner okteta python3 mesa
              boost purpose subversion)
 optdepends=('konsole: embedded terminal'
@@ -21,10 +22,10 @@ optdepends=('konsole: embedded terminal'
 	'cmake: cmake integration'
 	'qt5-tools: qthelp plugin'
  	'okteta: hex editor integration'
-	'plasma-framework: for the plasma addons')
-conflicts=(kdevplatform)
-replaces=(kdevplatform)
-install="$pkgname.install"
+	'plasma-framework: for the plasma addons'
+	'cppcheck: code analyzer'
+	'heaptrack: memory profiler'
+	'kdevelop-clang-tidy: clang-tidy analyzer plugin')
 source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.asc})
 sha256sums=("`grep ${pkgname}-${pkgver}.tar.xz  ../kdevelop.checksums | cut -d " " -f1`"
             'SKIP')
@@ -37,7 +38,13 @@ prepare() {
 
 build() {
   cd build
-  cmake_kf5 ../${pkgname}-${pkgver}
+  cmake  ../${pkgname}-${pkgver} \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DKDE_INSTALL_LIBDIR=lib \
+        -DKDE_INSTALL_SYSCONFDIR=/etc \
+        -DKDE_INSTALL_LIBEXECDIR=lib \
+        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
   make 
 }
 
diff --git a/kdevelop/kdevelop.install b/kdevelop/kdevelop.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kdevelop/kdevelop.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kdevplatform/PKGBUILD b/kdevplatform/PKGBUILD
deleted file mode 100644
index e929fa18e..000000000
--- a/kdevplatform/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Include global configuration
-source ../kdeapps.conf
-
-pkgname=kdevplatform
-pkgver=$_kdevver
-pkgrel=1
-pkgdesc='A C/C++ development platform for KDE'
-arch=(x86_64)
-url='http://www.kdevelop.org/'
-license=(GPL)
-option=('debug')
-depends=(grantlee-qt5 hicolor-icon-theme kcmutils threadweaver kitemmodels ktexteditor knotifyconfig knewstuff libkomparediff2 qt5-webkit)
-makedepends=(extra-cmake-modules boost subversion)
-optdepends=('subversion: Subversion plugin')
-install="$pkgname.install"
-source=("http://download.kde.org/stable/kdevelop/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.asc})
-sha256sums=("`grep ${pkgname}-${pkgver}.tar.xz  ../kdevelop.checksums | cut -d " " -f1`"
-            'SKIP')
-validpgpkeys=('329FD02C5AA48FCC77A4BBF0AC44AC6DB29779E6')
-
-prepare() {
-  mkdir -p build
-
-  sed -i 's|qdbus|qdbus-qt5|g' "${pkgname}-${pkgver}/util/kdevplatform_shell_environment.sh"
-}
-
-build() {
-  cd build 
-  cmake_kf5 ../${pkgname}-${pkgver}
-  make 
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}
diff --git a/kdevplatform/kdevplatform.install b/kdevplatform/kdevplatform.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kdevplatform/kdevplatform.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}