diff --git a/debian/Makefile b/debian/Makefile
index 00e596135..fd8e5ffa0 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -184,7 +184,7 @@ $(kdir): post-install-$(subarch) $(wildcard templates/control.*.in)
 	cp changelog $(tkdir)/debian
 	cp copyright $(tkdir)/debian
 	substitute() {                                  \
-		class="$$2";                            \
+		class="$$2-class";                            \
 		desc="";                                \
 		[ -f "debian/arch/$(karch)/$(append)/desc.$$2" ] && . "debian/arch/$(karch)/$(append)/desc.$$2"; \
 		cat templates/control.$$1 |      \
diff --git a/debian/arch/s390/desc.s390 b/debian/arch/s390/desc.s390
index 0e66b7b3e..0d4a49d49 100644
--- a/debian/arch/s390/desc.s390
+++ b/debian/arch/s390/desc.s390
@@ -1,2 +1,2 @@
-class="IBM S/390"
+class="IBM S/390-class"
 desc="This kernel has support to IPL (boot) from a VM reader or DASD device."
diff --git a/debian/arch/s390/desc.s390x b/debian/arch/s390/desc.s390x
index f65384a48..21ee57333 100644
--- a/debian/arch/s390/desc.s390x
+++ b/debian/arch/s390/desc.s390x
@@ -1,2 +1,2 @@
-class="IBM zSeries"
+class="IBM zSeries-class"
 desc="This kernel has support to IPL (boot) from a VM reader or DASD device."
diff --git a/debian/arch/sparc/desc.sparc64 b/debian/arch/sparc/desc.sparc64
index 1bca9a80b..9315a5f8a 100644
--- a/debian/arch/sparc/desc.sparc64
+++ b/debian/arch/sparc/desc.sparc64
@@ -1 +1 @@
-class="uni-processor 64-bit UltraSPARC"
+class="uniprocessor 64-bit UltraSPARC class"
diff --git a/debian/arch/sparc/desc.sparc64-smp b/debian/arch/sparc/desc.sparc64-smp
index a1daadaed..7440b95cf 100644
--- a/debian/arch/sparc/desc.sparc64-smp
+++ b/debian/arch/sparc/desc.sparc64-smp
@@ -1 +1 @@
-class="multi-processor 64-bit UltraSPARC"
+class="multi-processor 64-bit UltraSPARC class"
diff --git a/debian/rules b/debian/rules
index f76aa9807..502c86e84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -259,7 +259,7 @@ debian/control: $(wildcard debian/templates/control.*.in)
 		sa="";					\
 		[ -f $$sa_tmp ] && sa=$$(basename $$(dirname $$sa_tmp))-; \
 		all_headers_pkgs=`get_all_headers_pkgs $$2 $$sa`; \
-		class="$$3";				\
+		class="$$3-class";				\
 		desc="";				\
 		[ -f "debian/arch/$$2/$$sa/desc.$$3" ] && . "debian/arch/$$2/$$sa/desc.$$3"; \
 		cat debian/templates/control.$$1 |	\
diff --git a/debian/templates/control.headers.flavour.in b/debian/templates/control.headers.flavour.in
index 29ff82c93..a9546dd23 100644
--- a/debian/templates/control.headers.flavour.in
+++ b/debian/templates/control.headers.flavour.in
@@ -4,9 +4,9 @@ Section: devel
 Priority: optional
 Depends: coreutils | fileutils (>= 4.0), linux-headers-@subarch@@version@-@abiname@
 Provides: linux-headers, linux-headers-@major@
-Description: Architecture-specific header files for Linux kernel @version@ on @class@
+Description: Architecture-specific header files for Linux kernel @version@ on @class@ machines
  This package provides the architecture-specific kernel header files
- for Linux kernel @version@ on @class@-class machines, generally
+ for Linux kernel @version@ on @class@ machines, generally
  used for building out-of-tree kernel modules.  These files are going to be
  installed into /usr/src/linux-headers-@subarch@@version@-@abiname@-@flavour@, and can
  be used for building modules that load into the kernel provided by the
diff --git a/debian/templates/control.image.in b/debian/templates/control.image.in
index 1cddff103..6982b1bd3 100644
--- a/debian/templates/control.image.in
+++ b/debian/templates/control.image.in
@@ -7,7 +7,7 @@ Depends: initrd-tools (>= 0.1.78), coreutils | fileutils (>= 4.0), module-init-t
 Conflicts: hotplug (<< 0.0.20040105-1)
 Suggests: aboot [alpha], lilo (>= 19.1) | grub [amd64 i386], elilo [ia64], vmelilo [m68k], arcboot (>= 0.3.8) [mips], colo [mipsel], delo [mipsel], s390-tools [s390], silo [sparc], fdutils, linux-doc-@version@ | linux-source-@version@
 Recommends: irqbalance [i386]
-Description: Linux kernel @version@ image on @class@
+Description: Linux kernel @version@ image on @class@ machines
  This package provides the binary image and pre-built loadable modules for
- Linux kernel @version@ on @class@ class machines.
+ Linux kernel @version@ on @class@ machines.
  @desc@