diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template
index 4d2ac19f970..2aa8e089346 100644
--- a/srcpkgs/gpsd/template
+++ b/srcpkgs/gpsd/template
@@ -4,17 +4,15 @@ version=3.15
 revision=1
 build_style=scons
 patch_args=-p1
-make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin udevdir=/usr/lib/udev"
-make_install_args="${make_build_args}"
+make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin udevdir=/usr/lib/udev CC=${CC}"
+make_install_args="${make_build_args} udev_install"
 short_desc="A GPS/AIS receiver monitoring daemon"
 maintainer="uriahheep <uriahheep@gmail.com>"
 license="BSD"
 homepage="http://www.catb.org/gpsd/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version}.tar.gz"
 checksum="81c89e271ae112313e68655ab30d227bc38fe7841ffbff0f1860b12a9d7696ea"
-system_groups="gpsd"
 system_accounts="gpsd"
-gpsd_pgroup="gpsd"
 
 depends="virtual?ntp-daemon ncurses libusb libcap libbluetooth pps-tools"
 hostmakedepends="scons pkg-config bc python libxslt xmlto asciidoc"
@@ -22,9 +20,15 @@ makedepends="libudev-devel ntp libusb-devel python-devel pygtk-devel ncurses-dev
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) :;;
+	arm*) make_build_args+=" python=0" ;;
 	*) hostmakedepends+=" qt-devel" ;;
 esac
 
+subpackages="gpsd-devel gpsd-python gpsd-xgps"
+if [ -z "$CROSS_BUILD" ]; then
+	subpackages+=" gpsd-qt gpsd-qt-devel"
+fi
+
 pre_build() {
 	unset CPPFLAGS
 }
@@ -33,11 +37,7 @@ pre_install() {
 	export DESTDIR=${DESTDIR}
 }
 
-do_install() {
-	scons ${makejobs} CC=$CC CXX=$CXX CCFLAGS="$CFLAGS" \
-		CXXFLAGS="$CXXFLAGS" LINKFLAGS="$LDFLAGS" \
-		prefix=/usr destdir=${DESTDIR} DESTDIR=${DESTDIR} \
-		${make_install_args} udev-install
+post_install() {
 	vlicense COPYING
 	vlicense AUTHORS
 }
@@ -73,12 +73,7 @@ gpsd-qt_package() {
 	short_desc+=" - Qt bindings"
 	depends="qt ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		case "$XBPS_TARGET_MACHINE" in
-			*-musl) :;;
-			arm*) :;;
-			*)
-				vmove usr/lib/libQgpsmm.so.* ;;
-		esac
+		vmove usr/lib/libQgpsmm.so.* ;;
 	}
 }
 
@@ -86,14 +81,10 @@ gpsd-qt-devel_package() {
 	short_desc+=" - Qt development files"
 	depends="qt-devel ${sourcepkg}-devel>=${version}_${revision}"
 	pkg_install() {
-		case "$XBPS_TARGET_MACHINE" in
-			*-musl) :;;
-			*)
-				vmove usr/lib/libQgpsmm.so
-				vmove usr/lib/pkgconfig/Qgpsmm.pc
-				vmove usr/lib/libQgpsmm.prl
-				vmove usr/share/man/man3/libQgpsmm.3 ;;
-		esac
+		vmove usr/lib/libQgpsmm.so
+		vmove usr/lib/pkgconfig/Qgpsmm.pc
+		vmove usr/lib/libQgpsmm.prl
+		vmove usr/share/man/man3/libQgpsmm.3 ;;
 	}
 }