diff --git a/packages/mpi/openmpi/openmpi-1.8.1 b/packages/mpi/openmpi/openmpi-1.8.1
index 62f4ceb..40d5ced 100755
--- a/packages/mpi/openmpi/openmpi-1.8.1
+++ b/packages/mpi/openmpi/openmpi-1.8.1
@@ -36,6 +36,13 @@ if [[ -d /opt/voltaire/fca ]]; then
     CONFIGURE_OPTS+=" --with-fca=/opt/voltaire/fca"
 fi
 
+if [ $enable_valgrind != 0 ]; then
+    module load valgrind
+    VALGRIND_HOME=$(dirname $(dirname $(which valgrind)))
+    CONFIGURE_OPTS+=" --enable-memchecker \
+        --with-valgrind=$VALGRIND_HOME"
+fi
+
 src_pretest() {
     make check
 }