diff --git a/srcpkgs/gst-plugins-base/gst-plugins-base-devel.template b/srcpkgs/gst-plugins-base/gst-plugins-base-devel.template
index 0954ee8f09..dca0e90140 100644
--- a/srcpkgs/gst-plugins-base/gst-plugins-base-devel.template
+++ b/srcpkgs/gst-plugins-base/gst-plugins-base-devel.template
@@ -1,12 +1,15 @@
 # Template file for 'gst-plugins-base-devel'.
 #
-depends="libgudev-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel libvisual-devel cdparanoia-devel libtheora-devel gstreamer-devel gst-plugins-base"
+depends="libgudev-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel
+ libvisual-devel cdparanoia-devel libtheora-devel gstreamer-devel
+ ${sourcepkg}-${version}_${revision}"
+noarch=yes
+
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
 do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
diff --git a/srcpkgs/gst-plugins-base/gst-plugins-base.rshlibs b/srcpkgs/gst-plugins-base/gst-plugins-base.rshlibs
index 2d7cc2b8f2..8bdc7a3ad4 100644
--- a/srcpkgs/gst-plugins-base/gst-plugins-base.rshlibs
+++ b/srcpkgs/gst-plugins-base/gst-plugins-base.rshlibs
@@ -1,35 +1,29 @@
 libgstreamer-0.10.so.0
 libgobject-2.0.so.0
 libglib-2.0.so.0
+libm.so.6
 libpthread.so.0
 libc.so.6
 libgstbase-0.10.so.0
-libgmodule-2.0.so.0
-libxml2.so.2
-libgthread-2.0.so.0
-librt.so.1
+libz.so.1
 liborc-0.4.so.0
-liborc-test-0.4.so.0
-libm.so.6
-libvorbisenc.so.2
-libvorbis.so.0
-libogg.so.0
-libgstdataprotocol-0.10.so.0
-libdl.so.2
-libvisual-0.4.so.0
-libgio-2.0.so.0
 libgstcontroller-0.10.so.0
-libtheoraenc.so.1
-libtheoradec.so.1
-libSM.so.6
-libICE.so.6
+libgstdataprotocol-0.10.so.0
+liborc-test-0.4.so.0
+libxml2.so.2
+libgio-2.0.so.0
 libX11.so.6
-libXv.so.1
 libXext.so.6
+libXv.so.1
 libasound.so.2
+libcdda_interface.so.0
+libcdda_paranoia.so.0
+libvisual-0.4.so.0
+libogg.so.0
 libpangocairo-1.0.so.0
 libpango-1.0.so.0
 libcairo.so.2
-libcdda_interface.so.0
-libcdda_paranoia.so.0
-libz.so.1
+libtheoraenc.so.1
+libtheoradec.so.1
+libvorbisenc.so.2
+libvorbis.so.0
diff --git a/srcpkgs/gst-plugins-base/template b/srcpkgs/gst-plugins-base/template
index e210a5c191..19317f4a1d 100644
--- a/srcpkgs/gst-plugins-base/template
+++ b/srcpkgs/gst-plugins-base/template
@@ -1,16 +1,20 @@
 # Template file for 'gst-plugins-base'.
 pkgname=gst-plugins-base
 version=0.10.36
-distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.xz"
+revision=2
+subpackages="$pkgname-devel"
 build_style=gnu-configure
 configure_args="--enable-experimental --disable-gnome_vfs
---with-gudev --disable-static"
-makedepends="pkg-config gobject-introspection libgudev-devel gstreamer-devel glib-devel libxml2-devel pango-devel cairo-devel freetype-devel fontconfig-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel libvisual-devel cdparanoia-devel libtheora-devel libvorbis-devel orc-devel"
-revision=1
+ --with-gudev --disable-static"
+makedepends="pkg-config gobject-introspection libgudev-devel gstreamer-devel
+ glib-devel libxml2-devel pango-devel cairo-devel freetype-devel
+ fontconfig-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel
+ libvisual-devel cdparanoia-devel libtheora-devel libvorbis-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
@@ -21,6 +25,3 @@ long_desc="
  plug-ins.
 
  This package contains a set of well-maintained base plug-ins."
-
-subpackages="$pkgname-devel"
-