diff --git a/srcpkgs/libvpx/template b/srcpkgs/libvpx/template
index 2cb2c046ec8..3365cde51cf 100644
--- a/srcpkgs/libvpx/template
+++ b/srcpkgs/libvpx/template
@@ -1,23 +1,24 @@
 # Template file for 'libvpx'
 pkgname=libvpx
 version=1.4.0
-revision=1
-wrksrc="${pkgname}-v${version}"
-hostmakedepends="git perl yasm"
+revision=2
+hostmakedepends="perl yasm"
 short_desc="The VP8/VP9 Codecs"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.webmproject.org"
 license="BSD"
+distfiles="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-${version}.tar.bz2"
+checksum=f582d9b2d60a592a4a3d8c32965ca2d2167e9ade38c6c30bac8801ff66a118e4
 
-do_fetch() {
-	git clone -b v${version} http://code.google.com/p/webm.libvpx ${wrksrc}
-}
 do_configure() {
-	export LD="$CC" AS=
+	export LD="$CC"
 
 	if [ "$CROSS_BUILD" ]; then
-		sed -e "s,generic-gnu,$XBPS_CROSS_TRIPLET," -i configure
-		_cross="--target=$XBPS_CROSS_TRIPLET"
+		case "$XBPS_TARGET_MACHINE" in
+			armv6*) _cross="--target=armv6-linux-gcc";;
+			armv7*) _cross="--target=armv7-linux-gcc";;
+			*) _cross="--target=generic-gnu";;
+		esac
 	fi
 	CFLAGS+=" -fPIC"