diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index 3753ad6ec8b..448daaafe85 100644
--- a/srcpkgs/librsvg/template
+++ b/srcpkgs/librsvg/template
@@ -1,11 +1,11 @@
 # Template build file for 'librsvg'.
 pkgname=librsvg
 version=2.40.1
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-introspection"
-hostmakedepends="pkg-config intltool python gobject-introspection"
-makedepends="libcroco-devel gtk+3-devel"
+configure_args="--disable-static"
+hostmakedepends="libtool pkg-config intltool python glib-devel gdk-pixbuf-devel"
+makedepends="libcroco-devel gtk+3-devel>=3.10.7_3"
 depends="gdk-pixbuf>=2.26.1_2"
 triggers="gtk-pixbuf-loaders"
 short_desc="SVG library for GNOME"
@@ -14,12 +14,26 @@ homepage="http://librsvg.sourceforge.net/"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7
-long_desc="
- librsvg is Raph's scalable vector graphics library. It provides support for
- SVG graphics, and is used by the GNOME desktop.
 
- This package provides the librsvg library as well as some addons: a pixbuf
- loader and a theme engine for the GTK+ toolkit."
+# 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
+
+pre_configure() {
+	libtoolize -f
+}
 
 librsvg-devel_package() {
 	depends="gdk-pixbuf-devel cairo-devel libcroco-devel ${sourcepkg}>=${version}_${revision}"
@@ -29,7 +43,9 @@ librsvg-devel_package() {
 		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
 	}
 }