diff --git a/srcpkgs/libgee08/template b/srcpkgs/libgee08/template
index ec54ed451b5..a5375e8f265 100644
--- a/srcpkgs/libgee08/template
+++ b/srcpkgs/libgee08/template
@@ -2,10 +2,10 @@
 pkgname=libgee08
 version=0.12.0
 wrksrc=libgee-${version}
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool gobject-introspection"
+hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel vala-devel>=0.22"
 short_desc="GObject collection library (0.8.x API)"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -14,13 +14,21 @@ homepage="http://live.gnome.org/Libgee"
 distfiles="${GNOME_SITE}/libgee/${version%.*}/libgee-${version}.tar.xz"
 checksum=d106ed63fe0da5d5ee89aa8197a373cf9a2b96688cc3060144bfc0a022496ea5
 
-post_install() {
-	# on crossbuild for armv6/7 /usr/share/gir-1.0 wont be installed
-	[ -d "${DESTDIR}/usr/share/gir-1.0" ] && return 0;
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
 
-	vmkdir usr/share/gir-1.0
-	vcopy gee/Gee-0.8.gir usr/share/gir-1.0
-}
+# 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
 
 libgee08-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
@@ -30,7 +38,9 @@ libgee08-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gir-1.0
-		vmove usr/share/vala
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
 	}
 }