diff --git a/debian/changelog b/debian/changelog
index acd3c0bfa..fe1f13bda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ linux (4.17~rc1-1~exp1) UNRELEASED; urgency=medium
   * [armhf] Enable MTD_NAND_MARVELL as module, replacing MTD_NAND_PXA3xx
   * linux-kbuild: Update genksyms makefile to run flex and bison
 
+  [ Luca Boccassi ]
+  * Build-Dep on libelf-dev even for nopython/notools builds to fix FTBFS,
+    needed when CONFIG_STACK_VALIDATION and CONFIG_UNWINDER_ORC are enabled.
+
  -- Ben Hutchings <ben@decadent.org.uk>  Thu, 19 Apr 2018 21:37:24 +0100
 
 linux (4.16-1) UNRELEASED; urgency=medium
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index bd12945b8..f648bd92c 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -39,7 +39,8 @@ Build-Depends-Arch:
 # - libbabeltrace-ctf-dev may or may not be needed as well
  libbabeltrace-dev (>= 1.5.3-2~) <!stage1 !pkg.linux.notools !nopython> | libbabeltrace-ctf-dev (>= 1.5.0) <!stage1 !pkg.linux.notools !nopython>,
  libdw-dev <!stage1 !pkg.linux.notools !nopython>,
- libelf-dev <!stage1 !pkg.linux.notools !nopython>,
+# needed for objtool with CONFIG_STACK_VALIDATION=y and CONFIG_UNWINDER_ORC=y
+ libelf-dev <!stage1>,
  libiberty-dev <!stage1 !pkg.linux.notools !nopython>,
  libnewt-dev <!stage1 !pkg.linux.notools !nopython>,
  libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc powerpcspe ppc64 ppc64el sparc x32] <!stage1 !pkg.linux.notools !nopython>,