diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 7c9ab412f..bffbfc4ce 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -76,6 +76,10 @@ class Gencontrol(Base):
             'ABINAME': self.abiname_version + self.abiname_part,
             'SOURCEVERSION': self.version.complete,
         })
+        if not self.config.merge('packages').get('tools-unversioned', True):
+            makeflags['DO_TOOLS_UNVERSIONED'] = False
+        if not self.config.merge('packages').get('tools-versioned', True):
+            makeflags['DO_TOOLS_VERSIONED'] = False
 
         # Prepare to generate debian/tests/control
         self.tests_control = None
@@ -107,10 +111,6 @@ class Gencontrol(Base):
         makeflags['ALL_TRIPLETS'] = ' '.join(triplet_enabled)
         if not self.config.merge('packages').get('docs', True):
             makeflags['DO_DOCS'] = False
-        if not self.config.merge('packages').get('tools-unversioned', True):
-            makeflags['DO_TOOLS_UNVERSIONED'] = False
-        if not self.config.merge('packages').get('tools-versioned', True):
-            makeflags['DO_TOOLS_VERSIONED'] = False
         super(Gencontrol, self).do_main_makefile(makefile, makeflags, extra)
 
         # linux-source-$UPSTREAMVERSION will contain all kconfig files
diff --git a/debian/changelog b/debian/changelog
index 5a814292c..78521505a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ linux (4.17~rc3-1~exp2) UNRELEASED; urgency=medium
   [ John Paul Adrian Glaubitz ]
   * [m68k] Enable CONFIG_PATA_GAYLE as module.
 
+  [ Ben Hutchings ]
+  * Fix building only versioned tools packages
+
  -- Luca Boccassi <bluca@debian.org>  Wed, 02 May 2018 12:59:01 +0100
 
 linux (4.17~rc3-1~exp1) experimental; urgency=medium