diff --git a/xf86dgaproto/PKGBUILD b/xf86dgaproto/PKGBUILD
index 663ba7360..517996145 100644
--- a/xf86dgaproto/PKGBUILD
+++ b/xf86dgaproto/PKGBUILD
@@ -1,17 +1,11 @@
-#
-# Platform Packages for Chakra, part of chakra-project.org
-#
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# Part of the X.org group
+# Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
 
 pkgname=xf86dgaproto
 pkgver=2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X11 Direct Graphics Access extension wire protocol"
-arch=(any)
+arch=(x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
@@ -19,10 +13,14 @@ md5sums=('a036dc2fcbf052ec10621fd48b68dbb1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}" || return 1
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}"
 }