diff --git a/testing/qml-asteroid/APKBUILD b/testing/qml-asteroid/APKBUILD
index 56db6959b1b9b3e1d409819dd9fc75782370690a..9a54b78097abbe07b04a9723b70168b21b60953a 100644
--- a/testing/qml-asteroid/APKBUILD
+++ b/testing/qml-asteroid/APKBUILD
@@ -1,37 +1,57 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qml-asteroid
-pkgver=0_git20201011
-pkgrel=1
-_commit="21a896931496190634c85a01dab01aaf9095d7eb"
+pkgver=0_git20210517
+pkgrel=0
+_commit="8945fa436e3fbb646bc35a9aa60c430323d7f2a7"
 pkgdesc="QML components, styles and demos for AsteroidOS"
 url="https://github.com/AsteroidOS/qml-asteroid"
-arch="all"
+# armhf blocked by qt5-qtvirtualkeyboard
+arch="all !armhf"
 license="LGPL-2.1-only"
+depends="qt5-qtvirtualkeyboard"
+# grep is required for the asteroid-generate-desktop.sh script, which is used by other packages
 depends_dev="
-	mapplauncherd-qt-dev
+	grep
 	mlite-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
 	qt5-qtsvg-dev
+	qt5-qttools-dev
+	"
+makedepends="$depends_dev
+	extra-cmake-modules
+	mapplauncherd-qt-dev
 	"
-makedepends="$depends_dev"
 subpackages="$pkgname-dev"
 source="https://github.com/asteroidos/qml-asteroid/archive/$_commit/qml-asteroid-$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit"
 
 build() {
-	qmake-qt5 \
-		PREFIX=/usr
-	make
+	cmake -B build \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DINSTALL_QML_IMPORT_DIR=/usr/lib/qt5/qml
+	cmake --build build
 }
 
 check() {
-	make check
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	INSTALL_ROOT="$pkgdir" make install
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+dev() {
+	default_dev
+
+	amove usr/share/*/cmake
+	amove usr/bin
 }
 
-sha512sums="5684df668682945f791872542930792f99404a77557910a4ba7353a46504ad95553cf595500e34afab4b2fc26141e0db1fcc7a56d4ed3907ad832975d31d59a9  qml-asteroid-21a896931496190634c85a01dab01aaf9095d7eb.tar.gz"
+sha512sums="
+b0bfc7f9ab090b319beba86091c987521f5d9a039c21e51c95a0336e0acf515bed88eb97fa42521daedfa5b45dfc7c3a81365eacd980c54ebaf311a2a573fadb  qml-asteroid-8945fa436e3fbb646bc35a9aa60c430323d7f2a7.tar.gz
+"