diff --git a/kdeadmin-kcron/PKGBUILD b/kdeadmin-kcron/PKGBUILD
index ce6db9e28..f2cc3e836 100644
--- a/kdeadmin-kcron/PKGBUILD
+++ b/kdeadmin-kcron/PKGBUILD
@@ -1,49 +1,34 @@
-# Maintainer:   H W Tovetjärn (totte) <totte@tott.es>
-# Contributors: Manuel Tortosa <manutortosa@chakra-project.org>
-
 # Include global configuration
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+source ../kdeapps.conf
 
 _pkgname="kcron"
-pkgname="kdeadmin-kcron"
+pkgname=
 arch=('x86_64')
 pkgver=${_kdever}
 pkgrel=1
 url="http://www.kde.org/"
-license=('GPL'
-         'LGPL'
-         'FDL')
+license=('GPL' 'LGPL' 'FDL')
 install=kdeadmin.install
 pkgdesc="Crontab editor"
 depends=("kde-runtime")
-groups=("kdeadmin"
-        "kde"
-        "kde-uninstall")
-conflicts=("kdeadmin-doc")
+makedepends=()
+groups=("kdeadmin" "kde" "kde-uninstall")
+conflicts=("kdeadmin-kcron")
+replaces=("kdeadmin-kcron")
+provides=("kdeadmin-kcron")
 categories=('system')
-options=('docs'
-         '!header'
-         'debug'
-         'log')
-makedepends=('pkg-config'
-             'cmake'
-             'automoc4')
+options=('docs' '!header' 'debug' 'log')
 source=("$_mirror/${_pkgname}-$_kdever.tar.xz")
 sha256sums=(`grep ${_pkgname}-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`)
 
 prepare() {
-  rm -rf "${srcdir}/build"
-  mkdir "${srcdir}/build"
+  mkdir -p build
 }
 
 build() {
-    cd "${srcdir}/build"
-    cmake ../${_pkgname}-${pkgver} \
-        -DCMAKE_BUILD_TYPE=${_build_type} \
-        -DCMAKE_INSTALL_PREFIX=${_installprefix} \
-        -DCMAKE_SKIP_RPATH=ON \
-        -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
-    make
+  cd build
+  cmake_kf5 ../${pkgname}-${pkgver}
+  make
 }
 
 package() {
diff --git a/kdeadmin-print-manager/PKGBUILD b/kdeadmin-print-manager/PKGBUILD
index d011bb62b..e20ae46e5 100644
--- a/kdeadmin-print-manager/PKGBUILD
+++ b/kdeadmin-print-manager/PKGBUILD
@@ -1,5 +1,6 @@
+# Contributions from Arch: https://www.archlinux.org/packages/extra/x86_64/kdeutils-print-manager/
 # Include global configuration
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+source ../kdeapps.conf
 
 pkgname=print-manager
 pkgver=${_kdever}
@@ -8,9 +9,9 @@ pkgdesc="A KDE tool for managing print jobs and printers"
 url="https://projects.kde.org/projects/playground/base/print-manager"
 arch=('x86_64')
 license=('GPL' 'LGPL' 'FDL')
-depends=("kde-workspace>=${_workspace_ver}" "libcups")
+depends=('kcmutils' 'libcups' 'plasma-framework')
 optdepends=('system-config-printer: auto-detect the printer driver')
-makedepends=('cmake' 'automoc4')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python3' 'qt5-tools')
 install=${pkgname}.install
 groups=("kde" "kdeadmin" "kde-uninstall")
 replaces=('kdeadmin-print-manager')
@@ -20,18 +21,17 @@ options=('docs' '!header' 'debug' 'log')
 source=("$_mirror/${pkgname}-$_kdever.tar.xz")
 sha256sums=(`grep ${pkgname}-$_kdever.tar.xz  ../checksums.txt | cut -d " " -f1`)
 
+prepare() {
+  mkdir -p build
+}
+
 build() {
-  cd $pkgname-$pkgver
-  mkdir build
   cd build
-  cmake .. \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
+  cmake_kf5 ../${pkgname}-${pkgver}
   make
 }
 
 package() {
     cd ${pkgname}-${pkgver}/build
     make DESTDIR=${pkgdir} install
-}
\ No newline at end of file
+}