diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py
index 2c71cbe5aa0e360ef68328eb3f4b6252af6f8d03..4dea197de2beff931c894b8cce76a641e6f5318b 100644
--- a/var/spack/repos/builtin/packages/flux-core/package.py
+++ b/var/spack/repos/builtin/packages/flux-core/package.py
@@ -23,11 +23,13 @@ class FluxCore(AutotoolsPackage):
     # This workaround is documented in PR #3543
     build_directory = 'spack-build'
 
-    variant('doc', default=False, description='Build flux manpages')
+    variant('docs', default=False, description='Build flux manpages')
     variant('cuda', default=False, description='Build dependencies with support for CUDA')
 
     depends_on("zeromq@4.0.4:")
-    depends_on("czmq@2.2:")
+    depends_on("czmq")
+    depends_on("czmq@2.2:3.99", when="@0.1:0.6.99")
+    depends_on("czmq@3.0.1:", when="@0.7:,master")
     depends_on("hwloc@1.11.1:1.99")
     depends_on("hwloc +cuda", when='+cuda')
     depends_on("lua", type=('build', 'run', 'link'))
@@ -37,9 +39,13 @@ class FluxCore(AutotoolsPackage):
     depends_on("munge")
     depends_on("libuuid")
     depends_on("python", type=('build', 'run'))
+    depends_on("python@2.7:2.99", when="@0.1.0:0.10.0")
+    depends_on("python@2.7:", when="@0.11.0:,master")
     depends_on("py-cffi", type=('build', 'run'))
+    depends_on("py-six", type=('build', 'run'), when="@0.11.0:,master")
     depends_on("jansson")
     depends_on("yaml-cpp")
+    depends_on("lz4", when="@0.11.0:,master")
 
     # versions up to 0.8.0 uses pylint to check Flux's python binding
     # later versions provide a configure flag and disable the check by default
@@ -57,11 +63,13 @@ def setup(self):
 
     @when('@master')
     def setup(self):
-        # Check in case we are running `spack diy` from an "unshallow" clone
-        if os.path.exists('.git/shallow'):
+        with working_dir(self.stage.source_path):
             # Allow git-describe to get last tag so flux-version works:
             git = which('git')
             git('fetch', '--unshallow')
+            git("config", "remote.origin.fetch",
+                "+refs/heads/*:refs/remotes/origin/*")
+            git('fetch', 'origin')
 
     def autoreconf(self, spec, prefix):
         self.setup()
diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py
index 388ea0a0b6abbf721919c0ab93379f747176cc80..d3c424f716c01ced33156a1a5172bf0534bc6b98 100644
--- a/var/spack/repos/builtin/packages/flux-sched/package.py
+++ b/var/spack/repos/builtin/packages/flux-sched/package.py
@@ -15,12 +15,15 @@ class FluxSched(AutotoolsPackage):
     git      = "https://github.com/flux-framework/flux-sched.git"
 
     version('master', branch='master')
+    version('0.6.0', '8aad185949038c7fb6b277e6a8282947917084ebbec5c5bf0ee3a81a0dcdbe41ba18b1df837c669ae7b48ca5f1e492a5172bffa6b9feb4dda1c6a7a85abed4e8')
     version('0.5.0', 'a9835c9c478aa41123a4e12672500052228aaf1ea770f74cb0901dbf4a049bd7d329e99d8d3484e39cfed1f911705030b2775dcfede39bc8bea59c6afe2549b1')
     version('0.4.0', '82732641ac4594ffe9b94ca442a99e92bf5f91bc14745af92203a887a40610dd44edda3ae07f9b6c8d63799b2968d87c8da28f1488edef1310d0d12be9bd6319')
 
     variant('cuda', default=False, description='Build dependencies with support for CUDA')
 
     depends_on("boost+graph", when='@0.5.0:,master')
+    depends_on("py-pyyaml", when="@0.7.0:,master")
+    depends_on("libxml2@2.9.1:", when="@0.6.0,master")
 
     depends_on("flux-core", type=('build', 'link', 'run'))
     depends_on("flux-core+cuda", when='+cuda')
@@ -39,11 +42,13 @@ def setup(self):
 
     @when('@master')
     def setup(self):
-        # Check in case we are running `spack diy` from an "unshallow" clone
-        if os.path.exists('.git/shallow'):
+        with working_dir(self.stage.source_path):
             # Allow git-describe to get last tag so flux-version works:
             git = which('git')
             git('fetch', '--unshallow')
+            git("config", "remote.origin.fetch",
+                "+refs/heads/*:refs/remotes/origin/*")
+            git('fetch', 'origin')
 
     def autoreconf(self, spec, prefix):
         self.setup()