diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template
index c1df14558cd..326da0761c2 100644
--- a/srcpkgs/colord/template
+++ b/srcpkgs/colord/template
@@ -1,13 +1,13 @@
 # Template file for 'colord'
 pkgname=colord
-version=1.0.4
+version=1.0.6
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile
  --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-vala
  --with-udevrulesdir=/usr/lib/udev/rules.d --disable-bash-completion
  --enable-polkit --enable-volume-search --with-daemon-user=colord"
-hostmakedepends="pkg-config intltool gobject-introspection docbook2x"
+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 systemd-devel sqlite-devel shared-color-profiles"
 depends="shared-color-profiles shadow"
@@ -22,12 +22,31 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/software/colord"
 license="GPL-2"
 distfiles="$homepage/releases/$pkgname-$version.tar.xz"
-checksum=e716d5c284031f7cc6a3fc7aeceab5df2bc5bb17920a57e37b2d800ce26d8bdc
+checksum=a40bbceaa3d3b1d6fd2777b181bf641b4eb49ad249796823585136c146ad7e8e
+
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+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
 
 libcolord_package() {
 	short_desc+=" - runtime library"
-	replaces="colord<0.1.23_3"
+	replaces="colord<1.0.6"
 	pkg_install() {
+		if [ "$build_option_gir" ]; then
+			vmove usr/lib/girepository-1.0
+		fi
 		vmove "usr/lib/*.so.*"
 	}
 }
@@ -39,7 +58,9 @@ colord-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/share/vala
 	}
 }