diff --git a/srcpkgs/gst-plugins-base/template b/srcpkgs/gst-plugins-base/template
index 849f82ea93..b8e78bece6 100644
--- a/srcpkgs/gst-plugins-base/template
+++ b/srcpkgs/gst-plugins-base/template
@@ -1,44 +1,91 @@
 # Template file for 'gst-plugins-base'.
 pkgname=gst-plugins-base
 version=0.10.36
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-experimental --disable-gnome_vfs
- --with-gudev --disable-static"
-makedepends="pkg-config gobject-introspection libgudev-devel gstreamer-devel
- pango-devel liboil-devel alsa-lib-devel libXv-devel libvisual-devel
- cdparanoia-devel libtheora-devel libvorbis-devel orc-devel"
+configure_args="
+	--with-gudev
+	--enable-experimental
+	--disable-gnome_vfs
+	--disable-ivorbis
+	--disable-static"
+hostmakedepends="
+	automake
+	libtool
+	gettext-devel
+	glib-devel
+	orc-devel
+	pkg-config"
+makedepends="
+	alsa-lib-devel
+	gstreamer-devel
+	libgudev-devel
+	libtheora-devel
+	libvisual-devel
+	libvorbis-devel
+	libXv-devel
+	pango-devel
+	orc-devel"
 short_desc="GStreamer Base Plug-ins"
 maintainer="Juan RP <xtraeme@gmail.org>"
 homepage="http://gstreamer.freedesktop.org/"
 license="GPL-2, LGPL-2.1"
 distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.xz"
 checksum=1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a
-long_desc="
- GStreamer is a streaming media framework, based on graphs of filters which
- operate on media data. Applications using this library can do anything
- real-time sound processing to playing videos, and just about anything
- else media-related. Its plugin-based architecture means that new data
- types or processing capabilities can be added simply by installing new
- plug-ins.
 
- This package contains a set of well-maintained base plug-ins."
+# Package build options
+build_options="cdparanoia gir"
+desc_option_gir="Enable support for CD audio (cdparanoia)"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable options for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="cdparanoia gir"
+fi
+
+if [ "$build_option_cdparanoia" ]; then
+	configure_args+=" --enable-cdparanoia"
+	makedepends+=" cdparanoia-devel"
+else
+	configure_args+=" --disable-cdparanoia"
+fi
+
+if [ "$build_option_gir" ]; then
+	configure_args+=" --enable-introspection"
+	makedepends+=" gobject-introspection"
+else
+	configure_args+=" --disable-introspection"
+fi
+
+pre_configure() {
+	autoreconf -fi
+}
 
 gst-plugins-base-devel_package() {
-	depends="libgudev-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel
-		libvisual-devel cdparanoia-devel libtheora-devel gstreamer-devel
-		${sourcepkg}-${version}_${revision}"
-	short_desc+=" -- development files"
+	depends="
+		alsa-lib-devel
+		gstreamer-devel
+		libgudev-devel
+		libtheora-devel
+		libvisual-devel
+		libvorbis-devel
+		libXv-devel
+		pango-devel
+		${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		vmove usr/share/gtk-doc
-		vmove "usr/share/gir*"
+		if [ "$build_option_gir" ]; then
+			vmove "usr/share/gir*"
+		fi
 	}
 }
 
 gst-plugins-base_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }