diff --git a/var/spack/packages/SAMRAI/package.py b/var/spack/packages/SAMRAI/package.py
index 3c3b06f647117ccf48f82f5199ef19f32a4eb2db..eef041f0d57f189eb97569e1e7f8ed3e39fc8369 100644
--- a/var/spack/packages/SAMRAI/package.py
+++ b/var/spack/packages/SAMRAI/package.py
@@ -11,6 +11,7 @@ class Samrai(Package):
     url      = "https://computation.llnl.gov/project/SAMRAI/download/SAMRAI-v3.9.1.tar.gz"
     list_url = homepage
 
+    version('3.9.1',      '232d04d0c995f5abf20d94350befd0b2')
     version('3.7.3',      '12d574eacadf8c9a70f1bb4cd1a69df6')
     version('3.7.2',      'f6a716f171c9fdbf3cb12f71fa6e2737')
     version('3.6.3-beta', 'ef0510bf2893042daedaca434e5ec6ce')
@@ -24,22 +25,25 @@ class Samrai(Package):
     depends_on("mpi")
     depends_on("zlib")
     depends_on("hdf5")
-    depends_on("boost@1.52.0")
+    depends_on("boost")
 
     # don't build tools with gcc
     patch('no-tool-build.patch', when='%gcc')
 
     # TODO: currently hard-coded to use openmpi - be careful!
     def install(self, spec, prefix):
+        mpi = next(m for m in ('openmpi', 'mpich', 'mvapich')
+                   if m in spec)
+
         configure(
             "--prefix=%s" % prefix,
-            "--with-CXX=%s" % spec['openmpi'].prefix.bin + "/mpic++",
-            "--with-CC=%s" % spec['openmpi'].prefix.bin + "/mpicc",
+            "--with-CXX=%s" % spec[mpi].prefix.bin + "/mpic++",
+            "--with-CC=%s" % spec[mpi].prefix.bin + "/mpicc",
             "--with-hdf5=%s" % spec['hdf5'].prefix,
             "--with-boost=%s" % spec['boost'].prefix,
             "--with-zlib=%s" % spec['zlib'].prefix,
-            "--disable-blas",
-            "--disable-lapack",
+            "--without-blas",
+            "--without-lapack",
             "--with-hypre=no",
             "--with-petsc=no",
             "--enable-opt",