diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index d68db911624..411e20596ba 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -551,6 +551,10 @@ def install(self, spec, prefix):
 
         threading_opts = self.determine_b2_options(spec, b2_options)
 
+        # Create headers if building from a git checkout
+        if '@develop' in spec:
+            b2('headers', *b2_options)
+
         b2('--clean', *b2_options)
 
         # In theory it could be done on one call but it fails on