diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template
index d458b460c07..f59a98b28a7 100644
--- a/srcpkgs/colord/template
+++ b/srcpkgs/colord/template
@@ -7,7 +7,8 @@ configure_args="--disable-static --disable-schemas-compile
  --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-vala
  --with-udevrulesdir=/usr/lib/udev/rules.d --with-daemon-user=colord
  --enable-polkit --enable-gusb --enable-udev --enable-sane
- --disable-argyllcms-sensor"
+ --disable-argyllcms-sensor $(vopt_enable gir introspection)
+ $(vopt_enable systemd systemd-login)"
 conf_files="/etc/colord.conf"
 replaces="shared-color-profiles>=0"
 system_accounts="colord"
@@ -24,9 +25,8 @@ checksum=e14a8541ff1c33d517ee2f6540c954f0f909b4ea65cf8cb53f181d29b3b69e60
 
 hostmakedepends="pkg-config intltool docbook2x"
 makedepends="vala-devel>=0.20 libgudev-devel polkit-devel lcms2-devel dbus-devel
- libusb-devel libgusb-devel>=0.1.6 sqlite-devel sane-devel bash-completion"
-
-nocross="http://build.voidlinux.eu/builders/armv7l_builder/builds/9133/steps/shell_3/logs/stdio"
+ libusb-devel libgusb-devel>=0.1.6 sqlite-devel sane-devel libudev-devel
+ $(vopt_if systemd systemd-devel) bash-completion"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gettext-devel glib-devel gtk-doc colord gobject-introspection"
@@ -40,25 +40,12 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gir"
 fi
 
-if [ "$build_option_gir" ]; then
-	configure_args+=" --enable-introspection"
-	hostmakedepends+=" gobject-introspection"
-else
-	configure_args+=" --disable-introspection"
-fi
-
-if [ "$build_option_systemd" ]; then
-	configure_args+=" --enable-systemd-login"
-	makedepends+=" systemd-devel"
-else
-	configure_args+=" --disable-systemd-login"
-fi
-
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
+		# Use host utils instead.
+		sed -e 's,$(CD_IT8),cd-it8,g' -i data/cmf/Makefile.am data/illuminant/Makefile.am
+		sed -e 's,$(CD_CREATE_PROFILE),cd-create-profile,g' -i data/profiles/Makefile.am
 		NOCONFIGURE=1 ./autogen.sh
-		# Use host cd-create-profile instead.
-		sed -e 's,$(top_builddir)/client/cd-create-profile,cd-create-profile,g' -i data/profiles/Makefile.in
 	fi
 }
 
@@ -72,7 +59,6 @@ libcolord_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
-
 colord-devel_package() {
 	depends="dbus-devel libglib-devel lcms2-devel libudev-devel libcolord>=${version}_${revision}"
 	short_desc+=" - development files"