diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 46d0af2b204..8270966808f 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -22,7 +22,7 @@ desc_option_dolphin="Build KDE dolphin support"
 build_options_default="dolphin"
 
 case "$XBPS_TARGET_MACHINE" in
-	armv6*|armv7*) broken="qt5-tools-devel unavailable" ;;
+	arm*) broken="qt5-webengine-devel unavailable" ;;
 esac
 
 if [ "$CROSS_BUILD" ]; then
@@ -30,8 +30,8 @@ if [ "$CROSS_BUILD" ]; then
 	# provides desktoptojson
 	hostmakedepends+=" $(vopt_if dolphin 'kcoreaddons')"
 fi
+subpackages="$(vopt_if dolphin 'nextcloud-client-dolphin') nextcloud-client-devel"
 
-if [ $build_option_dolphin ]; then
 nextcloud-client-dolphin_package() {
 	short_desc+=" - KDE dolphin integration"
 	depends="nextcloud-client>=${version}_${revision}"
@@ -41,7 +41,6 @@ nextcloud-client-dolphin_package() {
 		vmove usr/share/kservices5
 	}
 }
-fi
 
 nextcloud-client-devel_package() {
 	depends="nextcloud-client>=${version}_${revision}"