diff --git a/debian/build/tools/perf/Makefile b/debian/build/tools/perf/Makefile
index fa1b0b8ab..d92ded4be 100644
--- a/debian/build/tools/perf/Makefile
+++ b/debian/build/tools/perf/Makefile
@@ -7,7 +7,7 @@ DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 ifeq ($(DEB_HOST_ARCH_CPU),alpha)
   KERNEL_ARCH_PERF = alpha
 else ifeq ($(DEB_HOST_ARCH_CPU),amd64)
-  KERNEL_ARCH_PERF = x86_64
+  KERNEL_ARCH_PERF = x86
 else ifeq ($(DEB_HOST_ARCH_CPU),arm)
   KERNEL_ARCH_PERF = arm
 else ifeq ($(DEB_HOST_ARCH_CPU),arm64)
@@ -15,7 +15,7 @@ else ifeq ($(DEB_HOST_ARCH_CPU),arm64)
 else ifeq ($(DEB_HOST_ARCH_CPU),hppa)
   KERNEL_ARCH_PERF = parisc
 else ifeq ($(DEB_HOST_ARCH_CPU),i386)
-  KERNEL_ARCH_PERF = i386
+  KERNEL_ARCH_PERF = x86
 else ifeq ($(DEB_HOST_ARCH_CPU),mips)
   KERNEL_ARCH_PERF = mips
 else ifeq ($(DEB_HOST_ARCH_CPU),mips64)
diff --git a/debian/changelog b/debian/changelog
index e394a76b2..d8aaa8285 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ linux-tools (4.0.2-1) UNRELEASED; urgency=medium
   * New upstream release
   * linux-tools: Add version suffix to the new perf-read-vdso{,x}32
     commands
+  * linux-tools: Set ARCH=x86 when building for either amd64 or i386
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 11 May 2015 00:46:20 +0100