diff --git a/var/spack/repos/builtin/packages/bpp-core/package.py b/var/spack/repos/builtin/packages/bpp-core/package.py
index 40360a03b3..f716a2ee05 100644
--- a/var/spack/repos/builtin/packages/bpp-core/package.py
+++ b/var/spack/repos/builtin/packages/bpp-core/package.py
@@ -33,7 +33,7 @@ class BppCore(Package):
 
     version('2.2.0', '5789ed2ae8687d13664140cd77203477')
 
-    depends_on('cmake')
+    depends_on('cmake', type='build')
 
     def install(self, spec, prefix):
         cmake('-DBUILD_TESTING=FALSE', '.', *std_cmake_args)
diff --git a/var/spack/repos/builtin/packages/bpp-phyl/package.py b/var/spack/repos/builtin/packages/bpp-phyl/package.py
index 62db8d5545..4ff77f1540 100644
--- a/var/spack/repos/builtin/packages/bpp-phyl/package.py
+++ b/var/spack/repos/builtin/packages/bpp-phyl/package.py
@@ -33,7 +33,7 @@ class BppPhyl(Package):
 
     version('2.2.0', '5c40667ec0bf37e0ecaba321be932770')
 
-    depends_on('cmake')
+    depends_on('cmake', type='build')
     depends_on('bpp-core')
     depends_on('bpp-seq')
 
diff --git a/var/spack/repos/builtin/packages/bpp-seq/package.py b/var/spack/repos/builtin/packages/bpp-seq/package.py
index 7132c668b3..15c99da2b1 100644
--- a/var/spack/repos/builtin/packages/bpp-seq/package.py
+++ b/var/spack/repos/builtin/packages/bpp-seq/package.py
@@ -33,7 +33,7 @@ class BppSeq(Package):
 
     version('2.2.0', '44adef0ff4d5ca4e69ccf258c9270633')
 
-    depends_on('cmake')
+    depends_on('cmake', type='build')
     depends_on('bpp-core')
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/bpp-suite/package.py b/var/spack/repos/builtin/packages/bpp-suite/package.py
index 41e90e375d..ef7f25a7ce 100644
--- a/var/spack/repos/builtin/packages/bpp-suite/package.py
+++ b/var/spack/repos/builtin/packages/bpp-suite/package.py
@@ -35,8 +35,8 @@ class BppSuite(Package):
     version('2.2.0', 'd8b29ad7ccf5bd3a7beb701350c9e2a4')
 
     # FIXME: Add dependencies if required.
-    depends_on('cmake')
-    depends_on('texinfo')
+    depends_on('cmake', type='build')
+    depends_on('texinfo', type='build')
     depends_on('bpp-core')
     depends_on('bpp-seq')
     depends_on('bpp-phyl')
diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py
index 5f59286323..ce9675d300 100644
--- a/var/spack/repos/builtin/packages/cp2k/package.py
+++ b/var/spack/repos/builtin/packages/cp2k/package.py
@@ -42,7 +42,7 @@ class Cp2k(Package):
     variant('mpi', default=True, description='Enable MPI support')
     variant('plumed', default=False, description='Enable PLUMED support')
 
-    depends_on('python')  # Build dependency
+    depends_on('python', type='build')
 
     depends_on('lapack')
     depends_on('blas')
diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py
index ff2c2f6781..259498c145 100644
--- a/var/spack/repos/builtin/packages/go/package.py
+++ b/var/spack/repos/builtin/packages/go/package.py
@@ -25,7 +25,7 @@ class Go(Package):
     # to-do, make non-c self-hosting compilers feasible without backflips
     # should be a dep on external go compiler
     depends_on('go-bootstrap', type='build')
-    depends_on('git')
+    depends_on('git', type='alldeps')
 
     def install(self, spec, prefix):
         bash = which('bash')
diff --git a/var/spack/repos/builtin/packages/ibmisc/package.py b/var/spack/repos/builtin/packages/ibmisc/package.py
index 8e83058e94..736886df96 100644
--- a/var/spack/repos/builtin/packages/ibmisc/package.py
+++ b/var/spack/repos/builtin/packages/ibmisc/package.py
@@ -34,7 +34,7 @@ class Ibmisc(CMakePackage):
     depends_on('blitz', when='+blitz')
     depends_on('netcdf-cxx4', when='+netcdf')
     depends_on('udunits2', when='+udunits2')
-    depends_on('googletest', when='+googletest')
+    depends_on('googletest', when='+googletest', type='build')
     depends_on('py-cython', when='+python', type=nolink)
     depends_on('py-numpy', when='+python', type=nolink)
     depends_on('boost', when='+boost')
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py
index 8f592342b0..03cc7ba427 100644
--- a/var/spack/repos/builtin/packages/opencv/package.py
+++ b/var/spack/repos/builtin/packages/opencv/package.py
@@ -76,7 +76,7 @@ class Opencv(Package):
     depends_on('vtk', when='+vtk')
     depends_on('qt', when='+qt')
     depends_on('jdk', when='+java')
-    depends_on('py-numpy', when='+python')
+    depends_on('py-numpy', when='+python', type='nolink')
 
     extends('python', when='+python')
 
diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py
index 5e141060b2..270a4e68d8 100644
--- a/var/spack/repos/builtin/packages/openspeedshop/package.py
+++ b/var/spack/repos/builtin/packages/openspeedshop/package.py
@@ -104,9 +104,9 @@ class Openspeedshop(Package):
     depends_on("cmake@3.0.2", type='build')
     # Dependencies for openspeedshop that are common to all the variants of
     # the OpenSpeedShop build
-    depends_on("bison")
-    depends_on("flex")
-    depends_on("binutils@2.24+krellpatch")
+    depends_on("bison", type='build')
+    depends_on("flex", type='build')
+    depends_on("binutils@2.24+krellpatch", type='build')
     depends_on("libelf")
     depends_on("libdwarf")
     depends_on("sqlite")
diff --git a/var/spack/repos/builtin/packages/parmetis/package.py b/var/spack/repos/builtin/packages/parmetis/package.py
index 2750df2bdb..8afae91af1 100644
--- a/var/spack/repos/builtin/packages/parmetis/package.py
+++ b/var/spack/repos/builtin/packages/parmetis/package.py
@@ -44,7 +44,7 @@ class Parmetis(Package):
             description='Builds the library in debug mode')
     variant('gdb', default=False, description='Enables gdb support')
 
-    depends_on('cmake@2.8:', type='build')  # build dependency
+    depends_on('cmake@2.8:', type='build')
     depends_on('mpi')
     depends_on('metis@5:')
 
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index e496a3e4d5..4239fa292b 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -65,7 +65,7 @@ class Qt(Package):
     # depends_on("gperf")
     # depends_on("flex", type='build')
     # depends_on("bison", type='build')
-    # depends_on("ruby")
+    # depends_on("ruby", type='build')
     # depends_on("icu4c")
 
     # OpenGL hardware acceleration
diff --git a/var/spack/repos/builtin/packages/r-datatable/package.py b/var/spack/repos/builtin/packages/r-datatable/package.py
index 8b50643341..fb0b2f1053 100644
--- a/var/spack/repos/builtin/packages/r-datatable/package.py
+++ b/var/spack/repos/builtin/packages/r-datatable/package.py
@@ -39,7 +39,7 @@ class RDatatable(Package):
 
     extends('R')
 
-    depends_on('r-chron')
+    depends_on('r-chron', type='nolink')
 
     def install(self, spec, prefix):
         R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir),
diff --git a/var/spack/repos/builtin/packages/texlive/package.py b/var/spack/repos/builtin/packages/texlive/package.py
index 64158e74cb..9b947787d2 100644
--- a/var/spack/repos/builtin/packages/texlive/package.py
+++ b/var/spack/repos/builtin/packages/texlive/package.py
@@ -47,7 +47,7 @@ class Texlive(Package):
     variant('scheme',  default="small",
             description='Package subset to install (e.g. full, small, basic)')
 
-    depends_on('perl')
+    depends_on('perl', type='build')
 
     def install(self, spec, prefix):
         env = os.environ