diff --git a/debian/changelog b/debian/changelog
index 9199463d2..a79b3f915 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ linux-2.6 (3.0.0-2) UNRELEASED; urgency=low
   [ Aurelien Jarno ]
   * Add configuration files for s390x architecture.
 
+  [ Ben Hutchings ]
+  * linux-libc-dev: Install include/asm under arch-specific directory;
+    mark package as multi-arch-coinstallable (Multi-Arch: same)
+
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 27 Jul 2011 23:58:10 +0200
 
 linux-2.6 (3.0.0-1) unstable; urgency=low
diff --git a/debian/rules.real b/debian/rules.real
index 110f6e38a..93462e16d 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -306,6 +306,10 @@ install-libc-dev_$(ARCH):
 
 	rm -rf $(OUT_DIR)/include/drm $(OUT_DIR)/include/scsi
 	find $(OUT_DIR)/include \( -name .install -o -name ..install.cmd \) -execdir rm {} +
+
+	# Move include/asm to arch-specific directory
+	mkdir -p $(OUT_DIR)/$(DEB_HOST_GNU_TYPE)/include
+	mv $(OUT_DIR)/include/asm $(OUT_DIR)/$(DEB_HOST_GNU_TYPE)/include/
 	
 	+$(MAKE_SELF) install-base
 
diff --git a/debian/templates/control.libc-dev.in b/debian/templates/control.libc-dev.in
index 6c9239430..68b9ce83d 100644
--- a/debian/templates/control.libc-dev.in
+++ b/debian/templates/control.libc-dev.in
@@ -4,6 +4,7 @@ Depends: ${misc:Depends}
 Provides: linux-kernel-headers
 Replaces: linux-kernel-headers
 Conflicts: linux-kernel-headers
+Multi-Arch: same
 Description: Linux support headers for userspace development
  This package provides userspaces headers from the Linux kernel.  These headers
  are used by the installed headers for GNU glibc and other system libraries.