diff --git a/srcpkgs/telepathy-farstream/template b/srcpkgs/telepathy-farstream/template
index a772c62e9a9..a7592a010f4 100644
--- a/srcpkgs/telepathy-farstream/template
+++ b/srcpkgs/telepathy-farstream/template
@@ -1,13 +1,13 @@
 # Template file for 'telepathy-farstream'
 pkgname=telepathy-farstream
 version=0.6.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool libxslt"
-makedepends="vala-devel gobject-introspection
+makedepends="
  dbus-glib-devel telepathy-glib-devel>=0.19.9 farstream-devel>=0.2.0
- python-devel pygobject2-devel gst-python-devel"
+ python-devel pygobject2-devel gst-python-devel vala-devel"
 replaces="telepathy-farsight>=0"
 short_desc="Telepathy library that uses Farstream to handle Call channels"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -15,11 +15,22 @@ license="LGPL-2.1"
 homepage="http://telepathy.freedesktop.org"
 distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
 checksum=0524e09f6f3a9617b9dcb5a1c1cb75fa80afb722709f9967386a091925096413
-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-farstream-devel_package() {
 	depends="dbus-glib-devel telepathy-glib-devel farstream-devel>=0.2.0
@@ -28,7 +39,10 @@ telepathy-farstream-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		vmove usr/share/gtk-doc
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 	}
 }