diff --git a/lib/spack/spack/build_systems/intel.py b/lib/spack/spack/build_systems/intel.py
index 152e5eec16fc701836947bc296f05451b1e6bf69..36e0b966d16e96dd48d1905ab5b8220ae516bae6 100644
--- a/lib/spack/spack/build_systems/intel.py
+++ b/lib/spack/spack/build_systems/intel.py
@@ -964,7 +964,8 @@ def libs(self):
                 root=self.component_lib_dir('mpi'),
                 shared=True, recursive=True) + result
 
-        if '+mkl' in self.spec or self.provides('scalapack'):
+        if '^mpi' in self.spec.root and ('+mkl' in self.spec or
+                                         self.provides('scalapack')):
             result = self.scalapack_libs + result
 
         debug_print(result)
@@ -1199,6 +1200,9 @@ def install(self, spec, prefix):
         install_script = Executable('./install.sh')
         install_script.add_default_env('TMPDIR', tmpdir)
 
+        # Need to set HOME to avoid using ~/intel
+        install_script.add_default_env('HOME', prefix)
+
         # perform
         install_script('--silent', 'silent.cfg')