diff --git a/srcpkgs/gstreamer/template b/srcpkgs/gstreamer/template
index d773bc4ecf6..4d30b515657 100644
--- a/srcpkgs/gstreamer/template
+++ b/srcpkgs/gstreamer/template
@@ -1,10 +1,10 @@
 # Template file for 'gstreamer'.
 pkgname=gstreamer
 version=0.10.36
-revision=6
+revision=7
 build_style=gnu-configure
-configure_args="--disable-valgrind --enable-docbook"
-hostmakedepends="libtool pkg-config flex python perl docbook-xsl glib-devel"
+configure_args="--disable-valgrind --enable-docbook $(vopt_enable gir introspection)"
+hostmakedepends="libtool pkg-config flex python perl docbook-xsl glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libxml2-devel libglib-devel"
 short_desc="Core GStreamer libraries and elements"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
@@ -21,19 +21,12 @@ 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
 }
 
 gstreamer-devel_package() {
-	depends="libxml2-devel glib-devel gstreamer>=${version}_${revision}"
+	depends="${makedepends} gstreamer>=${version}_${revision}"
 	short_desc+=" -- development files"
 	pkg_install() {
 		vmove usr/include