diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template
index 2aa8e089346..d02fe169b14 100644
--- a/srcpkgs/gpsd/template
+++ b/srcpkgs/gpsd/template
@@ -24,9 +24,9 @@ case "$XBPS_TARGET_MACHINE" in
 	*) hostmakedepends+=" qt-devel" ;;
 esac
 
-subpackages="gpsd-devel gpsd-python gpsd-xgps"
+subpackages="gpsd-devel"
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" gpsd-qt gpsd-qt-devel"
+	subpackages+=" gpsd-python gpsd-xgps gpsd-qt gpsd-qt-devel"
 fi
 
 pre_build() {
@@ -73,7 +73,7 @@ gpsd-qt_package() {
 	short_desc+=" - Qt bindings"
 	depends="qt ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
-		vmove usr/lib/libQgpsmm.so.* ;;
+		vmove usr/lib/libQgpsmm.so.*
 	}
 }
 
@@ -84,7 +84,7 @@ gpsd-qt-devel_package() {
 		vmove usr/lib/libQgpsmm.so
 		vmove usr/lib/pkgconfig/Qgpsmm.pc
 		vmove usr/lib/libQgpsmm.prl
-		vmove usr/share/man/man3/libQgpsmm.3 ;;
+		vmove usr/share/man/man3/libQgpsmm.3
 	}
 }