diff --git a/main/xvidcore/APKBUILD b/main/xvidcore/APKBUILD
index eb6646ee6da..564b7668193 100644
--- a/main/xvidcore/APKBUILD
+++ b/main/xvidcore/APKBUILD
@@ -1,36 +1,30 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xvidcore
 pkgver=1.3.4
-pkgrel=0
+pkgrel=1
 pkgdesc="XviD is an open source MPEG-4 video codec"
 url="http://www.xvid.org/"
 arch="all"
-license="GPL"
+options="!check"  # No test suite
+license="GPL-2.0+"
 subpackages="$pkgname-dev"
 depends=
-makedepends="nasm"
+makedepends=
 source="http://downloads.xvid.org/downloads/$pkgname-$pkgver.tar.bz2"
-
-prepare() {
-	cd "$srcdir"/$pkgname
-}
+builddir="$srcdir/$pkgname/build/generic"
 
 build() {
-	cd "$srcdir"/$pkgname/build/generic
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--disable-assembly \
-		|| return 1
-	make || return 1
+		--disable-assembly
+	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname/build/generic
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	cd "$pkgdir"/usr/lib
 }
-md5sums="5e68b84e3286b7bbaa95ddc34f0fcace  xvidcore-1.3.4.tar.bz2"
-sha256sums="5faf6380b828db8ad29f0b69f030edf86d0fe26d1f9c5427030c6accd3ad8bf7  xvidcore-1.3.4.tar.bz2"
 sha512sums="09c0dca898ad8ba32161d979dea66730c235d9649e93e5053f0e0f0d02f8996f0f85d629728bff16d3253b71e0435809360e6cf4d72801e63c061f2a0b0dbe7d  xvidcore-1.3.4.tar.bz2"