diff --git a/srcpkgs/telepathy-logger/template b/srcpkgs/telepathy-logger/template
index 729084a4395..5343df341b0 100644
--- a/srcpkgs/telepathy-logger/template
+++ b/srcpkgs/telepathy-logger/template
@@ -1,10 +1,10 @@
 # Template file for 'telepathy-logger'
 pkgname=telepathy-logger
 version=0.8.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile"
-hostmakedepends="pkg-config intltool libxslt gobject-introspection"
+hostmakedepends="pkg-config intltool libxslt glib-devel"
 makedepends="dbus-glib-devel libxml2-devel sqlite-devel telepathy-glib-devel"
 short_desc="Telepathy framework logging daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,11 +12,22 @@ homepage="http://telepathy.freedesktop.org/wiki/Logger"
 license="LGPL-2.1"
 distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.bz2"
 checksum=d476f3c16fa25988ced2c0771de70542091d81b5fdd657317cad5c4b110520a2
-long_desc="
- Telepathy is a D-Bus framework for unifying real time communication,
- including instant messaging, voice calls and video calls. It abstracts
- differences between protocols to provide a unified interface for
- applications."
+
+# 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"
+	makedepends+=" gobject-introspection"
+else
+	configure_args+=" --disable-introspection"
+fi
 
 telepathy-logger-devel_package() {
 	depends="libxml2-devel telepathy-glib-devel ${sourcepkg}-${version}_${revision}"
@@ -24,7 +35,10 @@ telepathy-logger-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/share/gir-1.0
+		vmove "usr/lib/*.so"
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/share/gtk-doc
 	}
 }