diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index 488fba7f9..2a6e1501a 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,49 +1,43 @@
-# $Id: PKGBUILD 145920 2012-01-04 01:26:04Z allan $
+# $Id$
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - patch to fix building on armv5 and armv6
+#  - drop openmpi support
 
 noautobuild=1
 
 pkgname=valgrind
 pkgver=3.9.0
-pkgrel=2
-pkgdesc="A tool to help find memory-management problems in programs"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://valgrind.org/"
+pkgrel=4
+pkgdesc='A tool to help find memory-management problems in programs'
+arch=(i686 x86_64)
+license=(GPL)
+url='http://valgrind.org/'
 depends=('glibc>=2.19' 'glibc<2.20' 'perl')
 makedepends=('gdb')
-options=('!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
+options=('staticlibs' '!emptydirs')
+source=(http://valgrind.org/downloads/$pkgname-$pkgver.tar.bz2
         alarm.patch
         valgrind-3.9.0-glibc-2.19.patch)
-md5sums=('0947de8112f946b9ce64764af7be6df2'
+sha1sums=('9415e28933de9d6687f993c4bb797e6bd49583f1'
          '65adc9cf0035ff8598f9997754527d64'
          '21020338ad5a93e6f9694946183e8835')
 
 prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
+  cd $pkgname-$pkgver
+  patch -p1 -i "$srcdir"/valgrind-3.9.0-glibc-2.19.patch
   [ "${CARCH}" = "arm" -o "${CARCH}" = "armv6h" ] && patch -Np1 -i ${srcdir}/alarm.patch
-
-  patch -p1 -i $srcdir/valgrind-3.9.0-glibc-2.19.patch
 }
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  if [[ ${CARCH} = "x86_64" ]]; then
-    ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
-  else
-    ./configure --prefix=/usr --mandir=/usr/share/man
-  fi
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }