diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py
index 89a7a4b641..44b85d4e11 100644
--- a/var/spack/repos/builtin/packages/hpctoolkit/package.py
+++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py
@@ -70,10 +70,12 @@ class Hpctoolkit(AutotoolsPackage):
     depends_on('intel-tbb+shared')
     depends_on('libdwarf')
     depends_on('libmonitor+hpctoolkit')
-    depends_on('libunwind@1.4: +xz')
+    depends_on('libunwind@1.4: +xz+pic', when='@2020.09.00:')
+    depends_on('libunwind@1.4: +xz', when='@:2020.08.99')
     depends_on('mbedtls+pic')
     depends_on('xerces-c transcoder=iconv')
-    depends_on('xz', type='link')
+    depends_on('xz+pic', type='link', when='@2020.09.00:')
+    depends_on('xz', type='link', when='@:2020.08.99')
     depends_on('zlib+shared')
 
     depends_on('cuda', when='+cuda')