diff --git a/debian/changelog b/debian/changelog
index aab6079a4..151831383 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ linux (4.7~rc2-1~exp1) UNRELEASED; urgency=medium
     later be signed
   * [rt] Disable until it is updated for 4.7 or later
   * cpupower: Bump soname version and rename library package accordingly
+  * debian/rules.d/Makefile: Override architecture detection when building
+    userland headers
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 07 Jun 2016 19:37:55 +0100
 
diff --git a/debian/rules.d/Makefile b/debian/rules.d/Makefile
index b03a795a7..6fab0dcd4 100644
--- a/debian/rules.d/Makefile
+++ b/debian/rules.d/Makefile
@@ -11,6 +11,6 @@ include $(top_rulesdir)/Makefile.inc
 # Build userland headers first
 unexport VERSION
 all-local:
-	$(MAKE) -C $(top_srcdir) O=$(CURDIR) \
+	$(MAKE) -C $(top_srcdir) ARCH=$(KERNEL_ARCH) O=$(CURDIR) \
 		INSTALL_HDR_PATH=$(CURDIR) headers_install
 all-recursive: all-local