diff --git a/community/vigra/PKGBUILD b/community/vigra/PKGBUILD
index 0531f6f9e..3b4085741 100644
--- a/community/vigra/PKGBUILD
+++ b/community/vigra/PKGBUILD
@@ -1,5 +1,6 @@
 # $Id$
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Maintainer: Bruno Pagani <archange@archlinux.org>
+# Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
@@ -8,32 +9,39 @@
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.11.1
-pkgrel=3
-arch=('i686' 'x86_64')
+pkgrel=4
+pkgdesc="Computer vision library"
+arch=('x86_64')
 url="https://ukoethe.github.io/vigra/"
 license=('custom:MIT')
 makedepends=(# runtime deps
              'libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw'
 	         # additional makedeps
              'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy')
-source=(https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/vigra-${pkgver}-src.tar.gz)
+source=("https://github.com/ukoethe/vigra/releases/download/Version-${pkgver//./-}/vigra-${pkgver}-src.tar.gz")
 sha256sums=('a5564e1083f6af6a885431c1ee718bad77d11f117198b277557f8558fa461aaf')
 
+prepare() {
+  mkdir -p build
+}
+
 build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+      -DCMAKE_INSTALL_PREFIX=/usr \
       -DPYTHON_EXECUTABLE=/usr/bin/python \
       -DWITH_OPENEXR=true \
       -DWITH_VIGRANUMPY=1 \
+      -DDOCDIR=../build/doc \
       -DDOCINSTALL=share/doc \
       $([ $CARCH == arm ] && echo "-DCMAKE_CXX_FLAGS=-std=c++11 -DWITH_BOOST_THREAD=1")
   make
 }
 
-#check() {
-#  cd "${srcdir}"/${pkgname}-${pkgver}
-#  make -j1 -k check #|| /bin/true # i686 fails
-#}
+check() {
+  cd build
+  make -j1 -k check || warning "Tests failed" # https://github.com/ukoethe/vigra/issues/409
+}
 
 package_vigra() {
   pkgdesc="Computer vision library"
@@ -41,25 +49,24 @@ package_vigra() {
   optdepends=('python: for python bindings'
               'boost-libs: for python bindings')
 
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd build
   make DESTDIR="${pkgdir}" install
-  # license
-  install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+  install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
   
-  # remove doc
+  # Remove doc
   rm -rf "${pkgdir}"/usr/share/doc
 }
 
 package_vigra-doc() {
   pkgdesc="Computer vision library - documentation and examples"
-  #depends=('vigra')
-  #arch=('any')
+  #arch=('any') # Not supported for now, maybe later
 
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd build
   make DESTDIR="${pkgdir}" install
-  # cleanup
+
+  # Remove vigra package content
   rm -rf "${pkgdir}"/usr/{bin,include,lib}
 
-  # license
-  install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }