diff --git a/bin86/PKGBUILD b/bin86/PKGBUILD
index f97abdba1af1ed490c2aa7437cc1972702e8af5b..0ee6a4c8671f97428515990971557893a1f6de71 100644
--- a/bin86/PKGBUILD
+++ b/bin86/PKGBUILD
@@ -1,29 +1,34 @@
 #
 # Core 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>
 
-
 pkgname=bin86
-pkgver=0.16.18
-pkgrel=2
+pkgver=0.16.19
+pkgrel=1
 pkgdesc="A complete 8086 assembler and loader"
-arch=(i686 x86_64)
+arch=('x86_64')
 license=('GPL')
 url="http://www.debath.co.uk/"
-groups=('base-devel')
 depends=('glibc')
-source=(http://www.debath.co.uk/dev86//$pkgname-$pkgver.tar.gz
-	bin86-0.16.17-x86_64-1.patch)
-md5sums=('914068fb649b93642d1cf21857b75699' '92bdce7b0655cd2e9f83c83fc56d128e')
+source=("http://www.debath.co.uk/dev86/$pkgname-$pkgver.tar.gz"
+        bin86-0.16.17-x86_64-1.patch)
+md5sums=('0a20d79765a6855ce7c8c2d02b23a0f0'
+         '92bdce7b0655cd2e9f83c83fc56d128e')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  if [ "$CARCH" = "x86_64" ]; then
-     patch -Np1 -i ../bin86-0.16.17-x86_64-1.patch || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+
+  if [[ $CARCH = x86_64 ]]; then
+     patch -Np1 < "$srcdir/bin86-0.16.17-x86_64-1.patch"
   fi
-  make PREFIX=/usr || return 1
-  mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1
-  make PREFIX=$pkgdir/usr MANDIR=$pkgdir/usr/share/man/man1 install
+
+  make PREFIX=/usr
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1"
+  make "PREFIX=$pkgdir/usr" "MANDIR=$pkgdir/usr/share/man/man1" install
 }