diff --git a/debian/changelog b/debian/changelog
index 042c9e6f3..0dd53f890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ linux (4.19~rc3-1~exp2) UNRELEASED; urgency=medium
   * debian/control: Fix restrictions for build-deps on asciidoctor and
     patchutils
   * Add support for specifying build-dependencies in binary package templates
+  * debian/templates: Move various build-dependencies to binary package
+    templates
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 10 Sep 2018 22:25:53 +0100
 
diff --git a/debian/templates/control.docs.in b/debian/templates/control.docs.in
index 4feaec26d..5d694cd04 100644
--- a/debian/templates/control.docs.in
+++ b/debian/templates/control.docs.in
@@ -1,6 +1,7 @@
 Package: @source_basename@-doc-@version@
 Build-Profiles: <!stage1 !nodoc>
 Architecture: all
+Build-Depends: graphviz, python3-sphinx, python3-sphinx-rtd-theme
 Depends: ${misc:Depends}
 Section: doc
 Multi-Arch: foreign
diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in
index b775da2de..cca790d3c 100644
--- a/debian/templates/control.main.in
+++ b/debian/templates/control.main.in
@@ -2,6 +2,7 @@ Package: @source_basename@-source-@version@
 Build-Profiles: <!stage1 !pkg.linux.nosource>
 Architecture: all
 Section: kernel
+Build-Depends: patchutils
 Depends: binutils, xz-utils, ${misc:Depends}
 Recommends: libc6-dev | libc-dev, gcc, make, bc, @source_basename@-config-@version@
 Suggests: libncurses-dev | ncurses-dev, libqt4-dev, pkg-config
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index b15e8e77f..a84cd3e83 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -30,40 +30,6 @@ Build-Depends-Arch:
 # used by upstream to build objtool (native for amd64 images; host arch for
 # linux-kbuild) and perf (host arch)
  libelf-dev:native [amd64] <!stage1>, libelf-dev <!stage1 !pkg.linux.notools>,
-# used by upstream to build perf documentation
- asciidoctor [alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64] <!stage1 !nodoc !pkg.linux.notools !nopython>,
-# used by upstream to build perf
- gcc-multilib [amd64 mips64 mips64el mips64r6 mips64r6el ppc64 s390x sparc64] <!stage1 !pkg.linux.notools !nopython>,
- libaudit-dev [alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64] <!stage1 !pkg.linux.notools !nopython>,
- libbabeltrace-dev (>= 1.5.0) [alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64] <!stage1 !pkg.linux.notools !nopython>,
-# - libbabeltrace-ctf-dev may or may not be needed as well
- libbabeltrace-dev (>= 1.5.3-2~) [alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64] <!stage1 !pkg.linux.notools !nopython>
- | libbabeltrace-ctf-dev (>= 1.5.0) [alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64] <!stage1 !pkg.linux.notools !nopython>,
- libdw-dev [alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64] <!stage1 !pkg.linux.notools !nopython>,
- libiberty-dev [alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64] <!stage1 !pkg.linux.notools !nopython>,
- libnewt-dev [alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64] <!stage1 !pkg.linux.notools !nopython>,
- libnuma-dev [alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64] <!stage1 !pkg.linux.notools !nopython>,
- libperl-dev [alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64] <!stage1 !pkg.linux.notools !nopython>,
- libunwind-dev [amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc ppc64 ppc64el sh4] <!stage1 !pkg.linux.notools !nopython>,
- python3-dev [alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64] <!stage1 !pkg.linux.notools !nopython>,
-# used by upstream to build usbip
- autoconf <!stage1 !pkg.linux.notools>,
- automake <!stage1 !pkg.linux.notools>,
- libtool <!stage1 !pkg.linux.notools>,
- libglib2.0-dev <!stage1 !pkg.linux.notools>,
- libudev-dev <!stage1 !pkg.linux.notools>,
- libwrap0-dev <!stage1 !pkg.linux.notools>,
-# used by debian/rules.d/tools/usb/usbip to build usbip
- rsync <!stage1 !pkg.linux.notools>,
-# used by upstream to build cpupower
- libpci-dev <!stage1 !pkg.linux.notools>,
-Build-Depends-Indep:
-# used by debian/rules.real to build linux-source
- patchutils <!stage1 !pkg.linux.nosource>,
-# used by upstream to build documentation
- graphviz <!stage1 !nodoc>,
- python3-sphinx <!stage1 !nodoc>,
- python3-sphinx-rtd-theme <!stage1 !nodoc>,
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/kernel-team/linux.git
 Vcs-Browser: https://salsa.debian.org/kernel-team/linux
diff --git a/debian/templates/control.tools-unversioned.in b/debian/templates/control.tools-unversioned.in
index dd8e0f2a8..8c9f54fed 100644
--- a/debian/templates/control.tools-unversioned.in
+++ b/debian/templates/control.tools-unversioned.in
@@ -2,6 +2,7 @@ Package: linux-cpupower
 Build-Profiles: <!stage1 !pkg.linux.notools>
 Section: admin
 Architecture: linux-any
+Build-Depends: libpci-dev
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: CPU power management tools for Linux
  The cpupower command allows inspection and control of cpufreq and
@@ -32,6 +33,15 @@ Description: CPU frequency and voltage scaling tools for Linux (development file
 Package: usbip
 Build-Profiles: <!stage1 !pkg.linux.notools>
 Architecture: linux-any
+Build-Depends:
+ autoconf,
+ automake,
+ libtool,
+ libglib2.0-dev,
+ libudev-dev,
+ libwrap0-dev,
+# used by debian/rules.d/tools/usb/usbip
+ rsync,
 Depends: usbutils, ${shlibs:Depends}, ${misc:Depends}
 Section: admin
 Description: USB device sharing system over IP network
diff --git a/debian/templates/control.tools-versioned.in b/debian/templates/control.tools-versioned.in
index 3899c7669..13cc2d48c 100644
--- a/debian/templates/control.tools-versioned.in
+++ b/debian/templates/control.tools-versioned.in
@@ -10,6 +10,20 @@ Package: linux-perf-@version@
 Build-Profiles: <!stage1 !pkg.linux.notools !nopython>
 Section: devel
 Architecture: alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64
+Build-Depends:
+ asciidoctor <!stage1 !nodoc !pkg.linux.notools !nopython>,
+ gcc-multilib [amd64 mips64 mips64el mips64r6 mips64r6el ppc64 s390x sparc64],
+ libaudit-dev,
+ libbabeltrace-dev (>= 1.5.0),
+# libbabeltrace-ctf-dev may or may not be needed as well
+ libbabeltrace-dev (>= 1.5.3-2~) | libbabeltrace-ctf-dev (>= 1.5.0),
+ libdw-dev,
+ libiberty-dev,
+ libnewt-dev,
+ libnuma-dev,
+ libperl-dev,
+ libunwind-dev [amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc ppc64 ppc64el sh4],
+ python3-dev,
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}
 Recommends: linux-base
 Provides: linux-tools-@version@