diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index 8ebf84d4658..0ef3b7b3998 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -1,32 +1,75 @@
 # Template file for 'gstreamer-vaapi'
 pkgname=gstreamer-vaapi
-version=0.4.0
-revision=2
-build_style=gnu-configure
-configure_args="--disable-static"
-makedepends="pkg-config libXrandr-devel libva-devel>=1:1.1.0
- gst-plugins-base-devel gst-plugins-bad-devel MesaLib-devel"
-short_desc="VA-API plugins for GStreamer"
+version=0.5.3
+revision=1
+hostmakedepends="pkg-config"
+makedepends="libXrandr-devel libva-devel>=1:1.1.0
+ gst-plugins-base-devel gst-plugins-bad-devel
+ gst-plugins-base1-devel gst-plugins-bad1-devel MesaLib-devel"
+short_desc="VA-API plugins for GStreamer (0.10.x)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
-homepage="http://www.splitted-desktop.com/static/libva/gstreamer-vaapi/"
+homepage="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/"
 distfiles="http://www.freedesktop.org/software/vaapi/releases/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=8bd9fcdcf8bb669a8b02176f35440d46cb96f5eb342455302690af455e06189c
+checksum=9f8647381514c6cadef7c15cc3a89f79c3dd2a3dcc2bfad66ff89cffea393bcb
 long_desc="
  ${pkgname} is a collection of GStreamer plugins and helper libraries that
  allow hardware accelerated video decoding through VA-API."
 
+do_configure() {
+	mkdir build-0.10 build-1.0
+
+	cd ${wrksrc}/build-0.10
+	../configure ${CONFIGURE_SHARED_ARGS} --disable-static --with-gstreamer-api=0.10
+
+	cd ${wrksrc}/build-1.0
+	../configure ${CONFIGURE_SHARED_ARGS} --disable-static --with-gstreamer-api=1.0
+}
+
+do_build() {
+	cd ${wrksrc}/build-0.10
+	make ${makejobs}
+
+	cd ${wrksrc}/build-1.0
+	make ${makejobs}
+}
+
+do_install() {
+	cd ${wrksrc}/build-0.10
+	make DESTDIR=${DESTDIR} install
+
+	cd ${wrksrc}/build-1.0
+	make DESTDIR=${DESTDIR} install
+}
+	
+gstreamer1-vaapi-devel_package() {
+	depends="gstreamer1-vaapi-${version}_${revision}"
+	short_desc="VA-API plugins for GStreamer (1.0) - development files"
+	pkg_install() {
+		vmove usr/include/gstreamer-1.0
+		vmove "usr/lib/pkgconfig/*-1.0*"
+	}
+}
+
+gstreamer1-vaapi_package() {
+	short_desc="VA-API plugins for GStreamer (1.0)"
+	pkg_install() {
+		vmove usr/lib/gstreamer-1.0
+		vmove "usr/lib/*-1.0*"
+	}
+}
+
 gstreamer-vaapi-devel_package() {
 	depends="${sourcepkg}-${version}_${revision}"
-	short_desc="${short_desc} -- development files"
+	short_desc="VA-API plugins for GStreamer (0.10.x) -- development files"
 	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
+		vmove "usr/include/*-0.10*"
+		vmove "usr/lib/pkgconfig/*-0.10*"
 	}
 }
 
 gstreamer-vaapi_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/gstreamer1-vaapi b/srcpkgs/gstreamer1-vaapi
new file mode 120000
index 00000000000..0fea40edca0
--- /dev/null
+++ b/srcpkgs/gstreamer1-vaapi
@@ -0,0 +1 @@
+gstreamer-vaapi
\ No newline at end of file
diff --git a/srcpkgs/gstreamer1-vaapi-devel b/srcpkgs/gstreamer1-vaapi-devel
new file mode 120000
index 00000000000..0fea40edca0
--- /dev/null
+++ b/srcpkgs/gstreamer1-vaapi-devel
@@ -0,0 +1 @@
+gstreamer-vaapi
\ No newline at end of file