diff --git a/var/spack/repos/builtin/packages/libcircle/package.py b/var/spack/repos/builtin/packages/libcircle/package.py
index c773d968b46a6ba128710885315e665a61a114b3..ffe9ad7cb552c9527a092b85be4c68061fe9dfb6 100644
--- a/var/spack/repos/builtin/packages/libcircle/package.py
+++ b/var/spack/repos/builtin/packages/libcircle/package.py
@@ -11,8 +11,17 @@ class Libcircle(AutotoolsPackage):
        using self-stabilizing work stealing."""
 
     homepage = "https://github.com/hpc/libcircle"
+    git      = "https://github.com/hpc/libcircle.git"
+    url      = "https://github.com/hpc/libcircle/releases/download/0.2.1-rc.1/libcircle-0.2.1-rc.1.tar.gz"
 
-    version('0.2.1-rc.1', sha256='5747f91cf4417023304dcc92fd07e3617ac712ca1eeb698880979bbca3f54865',
-            url='https://github.com/hpc/libcircle/releases/download/0.2.1-rc.1/libcircle-0.2.1-rc.1.tar.gz')
+    version('master', branch='master')
+    version('0.2.1-rc.1', sha256='5747f91cf4417023304dcc92fd07e3617ac712ca1eeb698880979bbca3f54865')
 
     depends_on('mpi')
+
+    @when('@master')
+    def autoreconf(self, spec, prefix):
+        with working_dir(self.configure_directory):
+            # Bootstrap with autotools
+            bash = which('bash')
+            bash('./autogen.sh')