diff --git a/srcpkgs/libgtop/template b/srcpkgs/libgtop/template
index c4bcd2703a0..59c86332444 100644
--- a/srcpkgs/libgtop/template
+++ b/srcpkgs/libgtop/template
@@ -1,10 +1,10 @@
 # Template build file for 'libgtop'.
 pkgname=libgtop
 version=2.28.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="-with-libgtop-smp"
-hostmakedepends="pkg-config intltool gobject-introspection"
+hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel libXau-devel"
 short_desc="Library to retrieve system information, used in GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,14 +12,25 @@ homepage="http://www.gnome.org/"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/$pkgname/2.28/$pkgname-$version.tar.xz"
 checksum=c812c174e44a8971a1f33265437cfd10f1e99869c7f5c05f8ee95846a70a3342
-long_desc="
- libgtop is a library that fetches system information about the running
- system such as cpu and memory usage, active processes etc. It
- provides a setgid server that fetches the information and a
- client-side library that talks to this server."
+
+# 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
 
 libgtop-devel_package() {
-	depends="libglib-devel libXau-devel libgtop>=${version}"
+	depends="libglib-devel libXau-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -27,7 +38,9 @@ libgtop-devel_package() {
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove usr/share/info
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/share/gtk-doc
 	}
 }