diff --git a/debian/changelog b/debian/changelog
index 40bf13b1b..dc28109fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -109,6 +109,7 @@ linux (4.17.3-1) UNRELEASED; urgency=medium
   * ext4: add more inode number paranoia checks (CVE-2018-10882)
   * jfs: Fix inconsistency between memory allocation and ea_buf->max_size
     (CVE-2018-12233)
+  * debian/control: Move bison and flex to Build-Depends (Closes: #901712)
 
   [ Romain Perier ]
   * [x86] amdgpu: Enable DCN 1.0 Raven family (Closes: #901349)
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index f648bd92c..d3069aae9 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -15,6 +15,8 @@ Build-Depends:
  xz-utils <!stage1>,
 # used by debian/rules.real to build linux-perf and linux-support
  dh-python <!stage1>,
+# used by upstream to build genksyms, kconfig, and perf
+ bison <!stage1>, flex (>= 2.6.1-1.1~) <!stage1>,
 Build-Depends-Arch:
 # used by debian/rules.real to build udebs
  kernel-wedge (>= 2.93~) <!stage1>,
@@ -28,10 +30,6 @@ Build-Depends-Arch:
 # used by upstream to build perf documentation
  asciidoc-base <!stage1 !nodoc !pkg.linux.notools>,
  xmlto <!stage1 !nodoc !pkg.linux.notools>,
-# used by upstream to build genksyms, kconfig, and perf
- bison <!stage1>,
-# - flex needs to run on the host; we have the same problem as for openssl
- flex (>= 2.6.1-1.1~) <!stage1>,
 # used by upstream to build perf
  gcc-multilib [amd64 ppc64 s390x sparc64] <!stage1 !pkg.linux.notools !nopython>,
  libaudit-dev <!stage1 !pkg.linux.notools !nopython>,