diff --git a/debian/changelog b/debian/changelog
index c79456db6..f1a5d83c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -177,6 +177,10 @@ linux (4.9.3-1) UNRELEASED; urgency=medium
     - Revert "usb: gadget: composite: always set ep->mult to a sensible value"
     - usb: gadget: composite: always set ep->mult to a sensible value
 
+  [ Ben Hutchings ]
+  * [armel,armhf,s390x,x86] linux-headers: Fix regression of multilib compiler
+    support (Closes: #851481)
+
  -- Salvatore Bonaccorso <carnil@debian.org>  Sun, 15 Jan 2017 14:48:41 +0100
 
 linux (4.9.2-2) unstable; urgency=medium
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 438bc1ed4..e15f609a2 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -15,7 +15,7 @@ install-stem: vmlinuz
 breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
 
 [relations]
-headers%gcc-5: linux-compiler-gcc-5-x86
+headers%gcc-6: linux-compiler-gcc-6-x86
 
 [amd64_description]
 hardware: 64-bit PCs
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index 912932cfb..60ced19da 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -14,7 +14,7 @@ signed-modules: false
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-5: linux-compiler-gcc-5-arm
+headers%gcc-6: linux-compiler-gcc-6-arm
 
 [marvell_description]
 hardware: Marvell Kirkwood/Orion
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index cfc082580..6cb465885 100644
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -12,7 +12,7 @@ vdso: true
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-5: linux-compiler-gcc-5-arm
+headers%gcc-6: linux-compiler-gcc-6-arm
 
 [armmp_description]
 hardware: ARMv7 multiplatform compatible SoCs
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index 414dbaebf..1123508b4 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -20,7 +20,7 @@ install-stem: vmlinuz
 breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)
 
 [relations]
-headers%gcc-5: linux-compiler-gcc-5-x86
+headers%gcc-6: linux-compiler-gcc-6-x86
 
 [686_description]
 hardware: older PCs
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
index 7131bd0d1..8dcf9fde1 100644
--- a/debian/config/s390x/defines
+++ b/debian/config/s390x/defines
@@ -12,7 +12,7 @@ bootloaders: s390-tools
 install-stem: vmlinuz
 
 [relations]
-headers%gcc-5: linux-compiler-gcc-5-s390
+headers%gcc-6: linux-compiler-gcc-6-s390
 
 [s390x_build]
 debug-info: true