diff --git a/var/spack/repos/builtin/packages/xsbench/package.py b/var/spack/repos/builtin/packages/xsbench/package.py
index 3648edc298a..b6040714d42 100644
--- a/var/spack/repos/builtin/packages/xsbench/package.py
+++ b/var/spack/repos/builtin/packages/xsbench/package.py
@@ -28,7 +28,12 @@ class Xsbench(MakefilePackage):
 
     depends_on('mpi', when='+mpi')
 
-    build_directory = 'src'
+    @property
+    def build_directory(self):
+        if self.spec.satisfies('@:18'):
+            return 'src'
+        else:
+            return 'openmp-threading'
 
     @property
     def build_targets(self):
@@ -50,4 +55,5 @@ def build_targets(self):
 
     def install(self, spec, prefix):
         mkdir(prefix.bin)
-        install('src/XSBench', prefix.bin)
+        with working_dir(self.build_directory):
+            install('XSBench', prefix.bin)