diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py
index 26d3bc0c94..c517defa83 100644
--- a/var/spack/repos/builtin/packages/mpich/package.py
+++ b/var/spack/repos/builtin/packages/mpich/package.py
@@ -51,6 +51,7 @@ def setup_dependent_environment(self, module, spec, dep_spec):
         os.environ['MPICH_CC']  = os.environ['CC']
         os.environ['MPICH_CXX'] = os.environ['CXX']
         os.environ['MPICH_F77'] = os.environ['F77']
+        os.environ['MPICH_F90'] = os.environ['FC']
         os.environ['MPICH_FC'] = os.environ['FC']