diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template
index a83f16574f9..dfd57de8461 100644
--- a/srcpkgs/gstreamer-vaapi/template
+++ b/srcpkgs/gstreamer-vaapi/template
@@ -1,75 +1,29 @@
 # Template file for 'gstreamer-vaapi'
 pkgname=gstreamer-vaapi
-version=0.5.9
+version=0.5.10
 revision=1
 lib32disabled=yes
+replaces="gstreamer1-vaapi>=0"
+build_style="gnu-configure"
+configure_args="--disable-builtin-libvpx --disable-static --disable-wayland --with-gstreamer-api=1.0"
 hostmakedepends="pkg-config"
-makedepends="libXrandr-devel libva-devel>=1:1.1.0 MesaLib-devel
- gst-plugins-bad-devel gst-plugins-bad1-devel>=1:1.0.10_2"
-short_desc="VA-API plugins for GStreamer (0.10.x)"
+makedepends="libXrandr-devel libva-devel>=1:1.1.0 MesaLib-devel gst-plugins-bad1-devel"
+short_desc="VA-API plugins for GStreamer (1.x)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/"
 distfiles="http://www.freedesktop.org/software/vaapi/releases/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=b5efbb5ccd3e9fd1ce16193dd14cfac327a8ec2662794c0067ff2603c3355003
+checksum=0dd236c7bf225322b8934fdba99a7a9e4542566a2acbe7564cdc3ec2c8b73c9d
 nocross=yes
 
-do_configure() {
-	mkdir build-0.10 build-1.0
-
-	configure_args+=" --disable-builtin-libvpx --disable-static --disable-wayland"
-
-	cd ${wrksrc}/build-0.10
-	../configure ${configure_args} --with-gstreamer-api=0.10
-
-	cd ${wrksrc}/build-1.0
-	../configure ${configure_args} --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() {
-	lib32disabled=yes
-	depends="gstreamer1-vaapi-${version}_${revision}"
-	short_desc="VA-API plugins for GStreamer (1.x) - development files"
-	pkg_install() {
-		vmove usr/include/gstreamer-1.*
-		vmove "usr/lib/pkgconfig/*-1.*"
-		vmove "usr/lib/*-1.*.so"
-	}
-}
-
-gstreamer1-vaapi_package() {
-	lib32disabled=yes
-	short_desc="VA-API plugins for GStreamer (1.x)"
-	depends="gst-plugins-base1>=1:1.2 gst-plugins-bad1>=1:1.2"
-	pkg_install() {
-		vmove usr/lib/gstreamer-1*
-		vmove "usr/lib/*-1.*.so.*"
-	}
-}
-
 gstreamer-vaapi-devel_package() {
 	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc="VA-API plugins for GStreamer (0.10.x) -- development files"
+	replaces="gstreamer1-vaapi-devel>=0"
+	depends="gstreamer-vaapi-${version}_${revision}"
+	short_desc="VA-API plugins for GStreamer (1.x) - development files"
 	pkg_install() {
-		vmove "usr/include/*-0.10*"
-		vmove "usr/lib/pkgconfig/*-0.10*"
-		vmove "usr/lib/*-0.10*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/*.so
 	}
 }
diff --git a/srcpkgs/gstreamer1-vaapi b/srcpkgs/gstreamer1-vaapi
deleted file mode 120000
index 0fea40edca0..00000000000
--- a/srcpkgs/gstreamer1-vaapi
+++ /dev/null
@@ -1 +0,0 @@
-gstreamer-vaapi
\ No newline at end of file
diff --git a/srcpkgs/gstreamer1-vaapi-devel b/srcpkgs/gstreamer1-vaapi-devel
deleted file mode 120000
index 0fea40edca0..00000000000
--- a/srcpkgs/gstreamer1-vaapi-devel
+++ /dev/null
@@ -1 +0,0 @@
-gstreamer-vaapi
\ No newline at end of file