diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py
index 00f6ba89b33..cef48968ec9 100644
--- a/var/spack/repos/builtin/packages/cmake/package.py
+++ b/var/spack/repos/builtin/packages/cmake/package.py
@@ -110,6 +110,12 @@ class Cmake(Package):
 
     phases = ['bootstrap', 'build', 'install']
 
+    def setup_environment(self, spack_env, run_env):
+        if self.compiler.name == 'fj' \
+                and self.compiler.cxx11_flag \
+                not in self.spec.compiler_flags['cxxflags']:
+            spack_env.append_flags('CXXFLAGS', self.compiler.cxx11_flag)
+
     def bootstrap_args(self):
         spec = self.spec
         args = [