diff --git a/debian/changelog b/debian/changelog
index 11b9a573f..d4b258b9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ linux (3.12.1-1~exp1) UNRELEASED; urgency=low
   [ Ben Hutchings ]
   * [rt] Update to 3.12.0-rt2 and reenable
 
+  [ Bastian Blank ]
+  * Use compiler name instead of Linux version in compiler meta-packages.
+
  -- Ben Hutchings <ben@decadent.org.uk>  Fri, 22 Nov 2013 00:41:09 +0000
 
 linux (3.12-1~exp1) experimental; urgency=low
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 8b69a439c..51cc7422c 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -12,7 +12,7 @@ bootloaders: grub-pc extlinux lilo
 configs:
 
 [relations]
-headers%gcc-4.8: linux-compiler-@version@-x86
+headers%gcc-4.8: linux-compiler-gcc-4.8-x86
 
 [amd64_description]
 hardware: 64-bit PCs
diff --git a/debian/config/armel/defines b/debian/config/armel/defines
index 1e3367fae..092b462aa 100644
--- a/debian/config/armel/defines
+++ b/debian/config/armel/defines
@@ -12,7 +12,7 @@ kernel-arch: arm
 suggests: fdutils
 
 [relations]
-headers%gcc-4.8: linux-compiler-@version@-arm
+headers%gcc-4.8: linux-compiler-gcc-4.8-arm
 
 [iop32x_build]
 image-file: arch/arm/boot/zImage
diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines
index e94361049..622dd0344 100644
--- a/debian/config/armhf/defines
+++ b/debian/config/armhf/defines
@@ -11,7 +11,7 @@ configs:
  armhf/config
 
 [relations]
-headers%gcc-4.8: linux-compiler-@version@-arm
+headers%gcc-4.8: linux-compiler-gcc-4.8--arm
 
 [armmp_build]
 image-file: arch/arm/boot/zImage
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index 22ba85c0c..72e1b3d7f 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -15,7 +15,7 @@ bootloaders: grub-pc extlinux lilo
 configs:
 
 [relations]
-headers%gcc-4.8: linux-compiler-@version@-x86
+headers%gcc-4.8: linux-compiler-gcc-4.8-x86
 
 [486_description]
 hardware: older PCs
diff --git a/debian/config/s390/defines b/debian/config/s390/defines
index a09de0914..f0d7147d7 100644
--- a/debian/config/s390/defines
+++ b/debian/config/s390/defines
@@ -8,7 +8,7 @@ bootloaders: s390-tools
 configs: s390x/config
 
 [relations]
-headers%gcc-4.8: linux-compiler-@version@-s390
+headers%gcc-4.8: linux-compiler-gcc-4.8-s390
 
 [s390x_build]
 debug-info: true
diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines
index 5bf81a8c0..502ba8247 100644
--- a/debian/config/s390x/defines
+++ b/debian/config/s390x/defines
@@ -7,7 +7,7 @@ kernel-arch: s390
 bootloaders: s390-tools
 
 [relations]
-headers%gcc-4.8: linux-compiler-@version@-s390
+headers%gcc-4.8: linux-compiler-gcc-4.8-s390
 
 [s390x_build]
 debug-info: true
diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in
index 85cda6e3c..6c955780a 100644
--- a/debian/templates/control.extra.in
+++ b/debian/templates/control.extra.in
@@ -1,23 +1,23 @@
-Package: linux-compiler-@version@-arm
+Package: linux-compiler-gcc-4.8-arm
 Depends: gcc-4.8, ${misc:Depends}
 Architecture: armel armhf
 Multi-Arch: foreign
-Description: Compiler for Linux @version@ on ARM (meta-package)
- This package depends on the appropriate compiler version for Linux @version@
- on ARM.
+Description: Compiler for Linux on ARM (meta-package)
+ This package depends on gcc 4.8 of the appropriate architecture for
+ Linux on armel and armhf.
 
-Package: linux-compiler-@version@-s390
+Package: linux-compiler-gcc-4.8-s390
 Depends: gcc-4.8, ${misc:Depends}
 Architecture: s390 s390x
 Multi-Arch: foreign
-Description: Compiler for Linux @version@ on IBM zSeries (meta-package)
- This package depends on the appropriate compiler version for Linux @version@
- on zSeries.
+Description: Compiler for Linux on IBM zSeries (meta-package)
+ This package depends on gcc 4.8 of the appropriate architecture for
+ Linux on s390 and s390x.
 
-Package: linux-compiler-@version@-x86
+Package: linux-compiler-gcc-4.8-x86
 Depends: gcc-4.8, ${misc:Depends}
 Architecture: amd64 i386 x32
 Multi-Arch: foreign
-Description: Compiler for Linux @version@ on x86 (meta-package)
- This package depends on the appropriate compiler version for Linux @version@
- on x86.
+Description: Compiler for Linux on x86 (meta-package)
+ This package depends on gcc 4.8 of the appropriate architecture for
+ Linux on amd64, i386 and x32.