diff --git a/debian/changelog b/debian/changelog
index 6e49f8c53..b6292e385 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ linux (4.6-1~exp2) UNRELEASED; urgency=medium
 
   * [tilegx] Build a linux-libc-dev package (Closes: #824524; thanks to
     Helmut Grohne)
+  * [tilegx] linux-libc-dev: Install <arch/*> headers in arch-specific
+    directory (Closes: #823632; thanks to Helmut Grohne)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 17 May 2016 23:33:30 +0100
 
diff --git a/debian/rules.real b/debian/rules.real
index 6e4776a30..2d416e585 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -345,6 +345,8 @@ install-libc-dev_$(ARCH):
 # Move include/asm to arch-specific directory
 	mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)
 	mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
+	test -d $(OUT_DIR)/include/arch && \
+		mv $(OUT_DIR)/include/arch $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
 
 	+$(MAKE_SELF) install-base