diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py
index cfc13c436db..fe19bdb404c 100644
--- a/var/spack/repos/builtin/packages/cmake/package.py
+++ b/var/spack/repos/builtin/packages/cmake/package.py
@@ -238,3 +238,9 @@ def test(self):
 
     def install(self, spec, prefix):
         make('install')
+
+        if spec.satisfies('%fj'):
+            for f in find(self.prefix, 'FindMPI.cmake', recursive=True):
+                filter_file('mpcc_r)', 'mpcc_r mpifcc)', f, string=True)
+                filter_file('mpc++_r)', 'mpc++_r mpiFCC)', f, string=True)
+                filter_file('mpifc)', 'mpifc mpifrt)', f, string=True)
diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py
index 2acc06e6bbd..75993c47010 100644
--- a/var/spack/repos/builtin/packages/netlib-scalapack/package.py
+++ b/var/spack/repos/builtin/packages/netlib-scalapack/package.py
@@ -82,15 +82,6 @@ def cmake_args(self):
                 "-DCMAKE_Fortran_FLAGS=%s" % self.compiler.fc_pic_flag
             ])
 
-        # Specify Fujitsu-MPI's location
-        if spec.satisfies('%fj') and '^fujitsu-mpi' in spec:
-            options.extend([
-                '-DMPI_C_COMPILER=%s'       % spec['mpi'].mpicc,
-                '-DMPI_CXX_COMPILER=%s'     % spec['mpi'].mpicxx,
-                '-DMPI_Fortran_COMPILER=%s' % spec['mpi'].mpifc,
-                '-DMPI_BASE_DIR=%s' % spec['mpi'].prefix
-            ])
-
         return options
 
     @run_after('install')