diff --git a/templates/gstreamer-devel b/templates/gstreamer-devel
new file mode 120000
index 00000000000..037f2c49071
--- /dev/null
+++ b/templates/gstreamer-devel
@@ -0,0 +1 @@
+gstreamer
\ No newline at end of file
diff --git a/templates/gstreamer/depends b/templates/gstreamer/depends
new file mode 100644
index 00000000000..96ef71f1b58
--- /dev/null
+++ b/templates/gstreamer/depends
@@ -0,0 +1,2 @@
+abi_depends=0.10.22
+api_depends=${abi_depends}
diff --git a/templates/gstreamer/devel.template b/templates/gstreamer/devel.template
new file mode 100644
index 00000000000..34139b39c55
--- /dev/null
+++ b/templates/gstreamer/devel.template
@@ -0,0 +1,24 @@
+# Template file for 'gstreamer-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run gstreamer
+
+do_install()
+{
+	local lver="0.10"
+
+	mkdir -p ${DESTDIR}/usr/lib/gstreamer-${lver}
+	mkdir -p ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/gstreamer-${lver}/*.*a \
+		${DESTDIR}/usr/lib/gstreamer-${lver}
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
+}
diff --git a/templates/gstreamer/template b/templates/gstreamer/template
index 86eeb217618..2349b1da0ff 100644
--- a/templates/gstreamer/template
+++ b/templates/gstreamer/template
@@ -1,12 +1,13 @@
 # Template file for 'gstreamer'.
 pkgname=gstreamer
-version=0.10.21
-distfiles="
-http://gstreamer.freedesktop.org/src/gstreamer/$pkgname-$version.tar.bz2"
+sourcepkg=$pkgname
+version=0.10.22
+distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
+configure_args="--disable-debug --disable-valgrind --enable-docbook"
 short_desc="Core GStreamer libraries and elements"
 maintainer="pancake <pancake@nopcode.org>"
-checksum=94c185a0452b5fcddb538f6b686ff959b7afca8340c48fdbe47c87a2a459c3d3
+checksum=61489e0192b1362e6dc760154204c73c1edd9ad9d8c754535483ec00ad7e389e
 long_desc="
  GStreamer is a library for constructing of graphs of media-handling components.
  The use cases it covers range from simple Ogg/Vorbis playback, audio/video
@@ -16,5 +17,10 @@ long_desc="
  transparently. Developers can add new codecs and filters by writing a simple
  plugin with a clean, generic interface."
 
-# Update db modules files once installed.
-postinstall_helpers="gtk-update-immodules.sh gtk-update-gdkpixbufloaders.sh"
+subpackages="devel"
+Add_dependency build pkg-config
+Add_dependency build python
+Add_dependency build docbook-xsl
+Add_dependency full glibc
+Add_dependency full glib
+Add_dependency full libxml2