diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index 5083d5d3c..91deb0036 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -3,10 +3,10 @@
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - patch to fix building on armv5 and armv6
-#  - drop openmpi support
+#  - hold for toolchain update, only build for v7
 
 noautobuild=1
+buildarch=4
 
 pkgname=valgrind
 pkgver=3.10.0
@@ -16,24 +16,22 @@ arch=(i686 x86_64)
 license=(GPL)
 url='http://valgrind.org/'
 depends=('glibc>=2.20' 'glibc<2.21' 'perl')
-makedepends=('gdb')
+makedepends=('gdb' 'openmpi')
+optdepends=('openmpi: MPI support')
 options=('staticlibs' '!emptydirs')
 source=(http://valgrind.org/downloads/$pkgname-$pkgver.tar.bz2
-        alarm.patch
-        valgrind-3.9.0-glibc-2.29.patch)
+        valgrind-3.9.0-glibc-2.20.patch)
 sha1sums=('aec0b8cd042ec36c8cce4f6027b98627ab202f26'
-          '3669a2f6e8c34ad95d05ecc92fe7b2d6661edc76'
           '2080c3d44de20857f18b03a93404a8f3d3721f7e')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -p1 -i "$srcdir"/valgrind-3.9.0-glibc-2.20.patch
-  [ "${CARCH}" = "arm" -o "${CARCH}" = "armv6h" ] && patch -Np1 -i ${srcdir}/alarm.patch
 }
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr --mandir=/usr/share/man --with-mpicc=mpicc
   make
 }