diff --git a/debian/build/tools/perf/Makefile b/debian/build/tools/perf/Makefile
index d21a33d29..d1b281300 100644
--- a/debian/build/tools/perf/Makefile
+++ b/debian/build/tools/perf/Makefile
@@ -3,11 +3,13 @@ OUTDIR = tools/perf
 include ../../Makefile.inc
 
 DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+NO_LIBUNWIND=1
 
 ifeq ($(DEB_HOST_ARCH_CPU),alpha)
   KERNEL_ARCH_PERF = alpha
 else ifeq ($(DEB_HOST_ARCH_CPU),amd64)
   KERNEL_ARCH_PERF = x86_64
+  NO_LIBUNWIND=
 else ifeq ($(DEB_HOST_ARCH_CPU),arm)
   KERNEL_ARCH_PERF = arm
 else ifeq ($(DEB_HOST_ARCH_CPU),arm64)
@@ -16,6 +18,7 @@ else ifeq ($(DEB_HOST_ARCH_CPU),hppa)
   KERNEL_ARCH_PERF = parisc
 else ifeq ($(DEB_HOST_ARCH_CPU),i386)
   KERNEL_ARCH_PERF = i386
+  NO_LIBUNWIND=
 else ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
   KERNEL_ARCH_PERF = powerpc
 else ifeq ($(DEB_HOST_ARCH_CPU),powerpc64)
@@ -34,7 +37,7 @@ else ifeq ($(DEB_HOST_ARCH_CPU),sparc64)
   KERNEL_ARCH_PERF = sparc
 endif
 
-MAKE_PERF := $(MAKE) prefix=/usr V=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error
+MAKE_PERF := $(MAKE) prefix=/usr V=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error NO_LIBUNWIND=$(NO_LIBUNWIND)
 
 # Disable Gtk UI until it's more usable
 MAKE_PERF += NO_GTK2=1
diff --git a/debian/changelog b/debian/changelog
index 339f284ed..468b7a51c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ linux-tools (3.16-3) UNRELEASED; urgency=low
   * linux-tools: Fix build configuration to avoid linking perf with libbfd
     (Closes: #763002)
   * linux-tools: Add a check that perf is not linked with libbfd
-  * [armel,armhf] linux-tools: Enable use of libunwind
   * [arm64] Enable building linux-tools, thanks to Steve Capper
     (Closes: #771340)