diff --git a/main/xkeyboard-config/APKBUILD b/main/xkeyboard-config/APKBUILD
index d32b5c88ac6..5fbabd1aff9 100644
--- a/main/xkeyboard-config/APKBUILD
+++ b/main/xkeyboard-config/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xkeyboard-config
 pkgver=2.21
-pkgrel=0
+pkgrel=1
 pkgdesc="X keyboard configuration files"
 url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 arch="noarch"
@@ -12,19 +12,10 @@ makedepends="xkbcomp intltool libx11-dev"
 source="http://www.x.org/archive/individual/data/xkeyboard-config/xkeyboard-config-$pkgver.tar.bz2
 	"
 
-_builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 
 	./configure \
 		--build=$CBUILD \
@@ -32,15 +23,19 @@ build() {
 		--prefix=/usr \
 		--with-xkb-base=/usr/share/X11/xkb \
 		--with-xkb-rules-symlink=xorg \
-		--enable-compat-rules=yes \
-		|| return 1
-	make || return 1
+		--enable-compat-rules=yes
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	rm -f "$pkgdir"/usr/share/X11/xkb/compiled || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	rm -f "$pkgdir"/usr/share/X11/xkb/compiled
 	install -m755 -d "$pkgdir"/var/lib/xkb
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }