diff --git a/debian/arch/m68k/defines b/debian/arch/m68k/defines
index 50ca56e5a..af6e63b15 100644
--- a/debian/arch/m68k/defines
+++ b/debian/arch/m68k/defines
@@ -1,2 +1,30 @@
 [DEFAULT]
 suggests: vmelilo, fdutils
+
+[amiga]
+class: Amiga
+
+[atari]
+class: Atari
+
+[bvme6000]
+class: BVM BVME4000 and BVME6000 SBCs
+
+[hp]
+class: HP
+
+[mac]
+class: Macintosh
+
+[mvme147]
+class: Motorola MVME147 SBCs
+
+[mvme16x]
+class: Motorola MVME162/6/7, MVME172/7 SBCs
+
+[q40]
+class: Q40 and Q60
+
+[sun3]
+class: sun3
+
diff --git a/debian/arch/m68k/desc.amiga b/debian/arch/m68k/desc.amiga
deleted file mode 100644
index e94d62ac1..000000000
--- a/debian/arch/m68k/desc.amiga
+++ /dev/null
@@ -1 +0,0 @@
-class="Amiga"
diff --git a/debian/arch/m68k/desc.atari b/debian/arch/m68k/desc.atari
deleted file mode 100644
index 0c4b786e8..000000000
--- a/debian/arch/m68k/desc.atari
+++ /dev/null
@@ -1 +0,0 @@
-class="Atari"
diff --git a/debian/arch/m68k/desc.bvme6000 b/debian/arch/m68k/desc.bvme6000
deleted file mode 100644
index 3d225fa1b..000000000
--- a/debian/arch/m68k/desc.bvme6000
+++ /dev/null
@@ -1 +0,0 @@
-class="BVM BVME4000 and BVME6000 SBCs"
diff --git a/debian/arch/m68k/desc.hp b/debian/arch/m68k/desc.hp
deleted file mode 100644
index 4e07d649e..000000000
--- a/debian/arch/m68k/desc.hp
+++ /dev/null
@@ -1 +0,0 @@
-class="HP"
diff --git a/debian/arch/m68k/desc.mac b/debian/arch/m68k/desc.mac
deleted file mode 100644
index f6a7ebcb6..000000000
--- a/debian/arch/m68k/desc.mac
+++ /dev/null
@@ -1 +0,0 @@
-class="Macintosh"
diff --git a/debian/arch/m68k/desc.mvme147 b/debian/arch/m68k/desc.mvme147
deleted file mode 100644
index b512a5bed..000000000
--- a/debian/arch/m68k/desc.mvme147
+++ /dev/null
@@ -1 +0,0 @@
-class="Motorola MVME147 SBCs"
diff --git a/debian/arch/m68k/desc.mvme16x b/debian/arch/m68k/desc.mvme16x
deleted file mode 100644
index d234710de..000000000
--- a/debian/arch/m68k/desc.mvme16x
+++ /dev/null
@@ -1 +0,0 @@
-class="Motorola MVME162/6/7, MVME172/7 SBCs"
diff --git a/debian/arch/m68k/desc.q40 b/debian/arch/m68k/desc.q40
deleted file mode 100644
index d7ef84ca2..000000000
--- a/debian/arch/m68k/desc.q40
+++ /dev/null
@@ -1 +0,0 @@
-class="Q40 and Q60"
diff --git a/debian/arch/m68k/desc.sun3 b/debian/arch/m68k/desc.sun3
deleted file mode 100644
index 175691efe..000000000
--- a/debian/arch/m68k/desc.sun3
+++ /dev/null
@@ -1 +0,0 @@
-class="sun3"
diff --git a/debian/changelog b/debian/changelog
index 18c1c2e51..8fee91b67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,7 @@ linux-2.6 (2.6.12-2) UNRELEASED; urgency=low
 
   * Add ARM support. (Vincent Sanders)
 
-  * Add desc.* files for ia64. (dann frazier)
+  * Add ia64 descriptions. (dann frazier)
 
   * Strip down the scripts dir in the headers packages. (Bastian Blank)
 
@@ -48,7 +48,6 @@ linux-2.6 (2.6.12-2) UNRELEASED; urgency=low
     - mkvmlinuz support was missing, should be fixed building with
       kernel-package 9.005. (Closes: #321625)
     - typo made the ams-ppc and asm-ppc64 headers not being included.
-    - re-added dependency on mkvmlinuz for powerpc.
 
  -- Sven Luther <luther@debian.org>  Sun,  7 Aug 2005 09:12:51 +0200