diff --git a/var/spack/repos/builtin/packages/argobots/package.py b/var/spack/repos/builtin/packages/argobots/package.py
index 666705b5a7..310300dbee 100644
--- a/var/spack/repos/builtin/packages/argobots/package.py
+++ b/var/spack/repos/builtin/packages/argobots/package.py
@@ -25,17 +25,27 @@ class Argobots(AutotoolsPackage):
     version("1.0.1", sha256="fa05a02d7f8f74d845647636609219ee02f6adf628ebcbf40393f829987d9036")
     version("1.0", sha256="36a0815f7bf99900a9c9c1eef61ef9b3b76aa2cfc4594a304f6c8c3296da8def")
 
+    variant("perf", default=True, description="Add performance optimization flags")
     variant("valgrind", default=False, description="Enable Valgrind")
     variant("debug", default=False, description="Compiled with debugging symbols")
+    variant("stackunwind", default=False, description="Enable function stack unwinding")
+    variant("stackguard", default="no", description="Enable stack guard",
+            values=('no', 'canary-32', 'mprotect', 'mprotect-strict'), multi=False)
+    variant("tool", default=False, description="Enable ABT_tool interface")
+    variant("affinity", default=False, description="Enable affinity setting")
 
     depends_on("m4", type=("build"), when="@main")
     depends_on("autoconf", type=("build"), when="@main")
     depends_on("automake", type=("build"), when="@main")
     depends_on("libtool", type=("build"), when="@main")
     depends_on("valgrind", when="+valgrind")
+    depends_on("libunwind", when="+stackunwind")
 
     def configure_args(self):
-        args = ["--enable-perf-opt"]
+        args = []
+        if '+perf' in self.spec:
+            args.append('--enable-perf-opt')
+
         if '+valgrind' in self.spec:
             args.append('--enable-valgrind')
         else:
@@ -46,4 +56,18 @@ def configure_args(self):
         else:
             args.append('--disable-debug')
 
+        if '+stackunwind' in self.spec:
+            args.append('--enable-stack-unwind')
+            args.append('--with-libunwind={0}'.format(self.spec['libunwind'].prefix))
+
+        stackguard = self.spec.variants['stackguard'].value
+        if stackguard != 'no':
+            args.append('--enable-stack-overflow-check={0}'.format(stackguard))
+
+        if '+tool' in self.spec:
+            args.append('--enable-tool')
+
+        if '+affinity' in self.spec:
+            args.append('--enable-affinity')
+
         return args