diff --git a/lib/spack/spack/platforms/cray_xc.py b/lib/spack/spack/platforms/cray_xc.py
index e3adb182ea..b37d36a62c 100644
--- a/lib/spack/spack/platforms/cray_xc.py
+++ b/lib/spack/spack/platforms/cray_xc.py
@@ -1,6 +1,6 @@
 import os
 
-from spack.architecture import Platform, Target
+from spack.architecture import Platform, Target, OperatingSystem
 
 class CrayXc(Platform):
     priority    = 20
@@ -8,6 +8,10 @@ class CrayXc(Platform):
     back_end    = 'ivybridge'
     default     = 'ivybridge'
 
+    front_os    = "SuSE11"
+    back_os     = "GNU/Linux"
+    default_os  = "GNU/Linux"
+
     def __init__(self):
         ''' Since cori doesn't have ivybridge as a front end it's better
             if we use CRAY_CPU_TARGET as the default. This will ensure
@@ -30,6 +34,9 @@ def __init__(self):
         self.add_target('sandybridge', Target('sandybridge', 'PATH'))
         self.add_target('ivybridge', Target('ivybridge', 'MODULES', 'craype-ivybridge'))
         self.add_target('haswell', Target('haswell', 'MODULES', 'craype-haswell'))
+        
+        self.add_operating_system('SuSE11', OperatingSystem('SuSE11', '11'))
+        self.add_operating_system('GNU/Linux', OperatingSystem('GNU/Linux', '10'))
 
 #        self.add_target(self.front_end, Target(self.front_end, 'PATH'))
         # Back End compiler needs the proper target module loaded.