diff --git a/lib/spack/spack/packages/mvapich2/__init__.py b/lib/spack/spack/packages/mvapich2/__init__.py
new file mode 100644
index 00000000000..f372679f49b
--- /dev/null
+++ b/lib/spack/spack/packages/mvapich2/__init__.py
@@ -0,0 +1,27 @@
+from spack import *
+
+class Mvapich2(Package):
+    """mvapich2 is an MPI implmenetation for infiniband networks."""
+
+    homepage = "http://mvapich.cse.ohio-state.edu/"
+    url      = "http://mvapich.cse.ohio-state.edu/download/mvapich2/mv2/mvapich2-1.9.tgz"
+
+    versions = { '1.9' : '5dc58ed08fd3142c260b70fe297e127c', }
+
+    provides('mpi@:1', when='@1.9:')
+
+    patch('ad_lustre_rwcontig_open_source.patch', when='@1.9:')
+
+    def install(self, spec, prefix):
+        configure(
+            "--prefix=" + prefix,
+            "--enable-f77", "--enable-fc", "--enable-cxx",
+            "--enable-fast=all", "--enable-g=dbg", "--enable-nmpi-as-mpi",
+            "--enable-shared", "--enable-sharedlibs=gcc",
+            "--enable-debuginfo",
+            "--with-pm=no", "--with-pmi=slurm",
+            "--with-device=ch3:psm",
+            "--enable-romio", "--with-file-system=lustre+nfs+ufs",
+            "--disable-mpe", "--without-mpe")
+        make()
+        make("install")
diff --git a/lib/spack/spack/packages/mvapich2/ad_lustre_rwcontig_open_source.patch b/lib/spack/spack/packages/mvapich2/ad_lustre_rwcontig_open_source.patch
new file mode 100644
index 00000000000..ff85845cf8e
--- /dev/null
+++ b/lib/spack/spack/packages/mvapich2/ad_lustre_rwcontig_open_source.patch
@@ -0,0 +1,11 @@
+--- a/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c	2013-12-10 12:05:44.806417000 -0800
++++ b/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c	2013-12-10 11:53:03.295622000 -0800
+@@ -8,7 +8,7 @@
+  *   Copyright (C) 2008 Sun Microsystems, Lustre group
+  */
+ 
+-#define _XOPEN_SOURCE 600
++//#define _XOPEN_SOURCE 600
+ #include <stdlib.h>
+ #include <malloc.h>
+ #include "ad_lustre.h"