diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template
index 11af2b671d..c6d8a11114 100644
--- a/srcpkgs/lightdm/template
+++ b/srcpkgs/lightdm/template
@@ -1,10 +1,11 @@
 # Template file for 'lightdm'
 pkgname=lightdm
 version=1.12.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-greeter-session=lightdm-gtk-greeter
- --with-greeter-user=lightdm --disable-static --disable-tests"
+ --with-greeter-user=lightdm --disable-static --disable-tests
+ $(vopt_enable gir introspection)"
 short_desc="Light Display Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3, LGPL-3"
@@ -15,10 +16,10 @@ checksum=ce36bacef7a0ac5b720dc0f4aeb1c37aa56e7b72f7390e290a670fb1b8231736
 # both install /etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf
 conflicts="sddm>=0"
 
-build_options="systemd"
-hostmakedepends="pkg-config intltool itstool gobject-introspection"
+build_options="gir systemd"
+hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection)"
 makedepends="dbus-glib-devel libxklavier-devel libxml2-devel
- qt-devel gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel
+ gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel
  libgcrypt-devel accountsservice-devel $(vopt_if systemd systemd-devel)"
 depends="dbus accountsservice $(vopt_if systemd '' 'ConsoleKit upower0')"
 conf_files="
@@ -30,6 +31,13 @@ conf_files="
 	/etc/pam.d/lightdm-autologin"
 system_accounts="lightdm"
 lightdm_homedir="/var/lib/lightdm"
+subpackages="liblightdm-gobject lightdm-devel"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+	makedepends+=" qt-devel"
+	subpackages+=" liblightdm-qt"
+fi
 
 post_install() {
 	# Remove provided init file and use our own.
@@ -53,27 +61,31 @@ liblightdm-gobject_package() {
 	short_desc+=" - GObject support library"
 	pkg_install() {
 		vmove "usr/lib/liblightdm-gobject*.so.*"
-		vmove usr/lib/girepository-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/lib/girepository-1.0
+		fi
 	}
 }
 liblightdm-qt_package() {
-	short_desc+=" - QT support library"
+	short_desc+=" - QT 4.x support library"
 	pkg_install() {
 		vmove "usr/lib/liblightdm-qt*.so.*"
 	}
 }
 lightdm-devel_package() {
-	depends="
-		libglib-devel
-		liblightdm-gobject>=${version}_${revision}
-		liblightdm-qt>=${version}_${revision}"
+	depends="libglib-devel liblightdm-gobject-${version}_${revision}"
+	if [ -z "$CROSS_BUILD" ]; then
+		depends+=" liblightdm-qt-${version}_${revision}"
+	fi
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove usr/share/gtk-doc
-		vmove usr/share/vala
-		vmove usr/share/gir-1.0
 		vmove "usr/lib/*.so"
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/vala
+			vmove usr/share/gir-1.0
+		fi
 	}
 }