diff --git a/debian/changelog b/debian/changelog
index d8ecbffe7..a8126f457 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 linux-2.6 (2.6.24~rc3-1~experimental.1) UNRELEASED; urgency=low
 
+  [ maximilian attems ]
   * New upstream release, rebase dfsg stuff plus drivers-atm.patch,
     scripts-kconfig-reportoldconfig.patch.
   * [amd64] Set HIGH_RES_TIMERS and NO_HZ.
@@ -14,7 +15,10 @@ linux-2.6 (2.6.24~rc3-1~experimental.1) UNRELEASED; urgency=low
   * Disable bcm43xx, deprecated by upstream. Enable B43 (needs v4 firmware)
     and B43LEGACY (needs v3 firmware).
 
- -- maximilian attems <maks@debian.org>  Thu, 29 Nov 2007 23:03:30 +0100
+  [ Bastian Blank ]
+  * [amd64, i386]: Set kernel architecture to x86.
+
+ -- Bastian Blank <waldi@debian.org>  Fri, 30 Nov 2007 11:56:55 +0100
 
 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low
 
diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines
index 6c74959a1..efa20f6b1 100644
--- a/debian/config/amd64/defines
+++ b/debian/config/amd64/defines
@@ -5,8 +5,7 @@ featuresets:
  xen-vserver
 flavours:
  amd64
-kernel-arch: x86_64
-kernel-header-dirs: x86_64 i386
+kernel-arch: x86
 
 [xen_base]
 enabled: false
diff --git a/debian/config/i386/defines b/debian/config/i386/defines
index e206861fb..db7412373 100644
--- a/debian/config/i386/defines
+++ b/debian/config/i386/defines
@@ -8,8 +8,7 @@ flavours:
  686
  686-bigmem
  amd64
-kernel-arch: i386
-kernel-header-dirs: i386 x86_64
+kernel-arch: x86
 
 [image]
 conflicts: grub (<= 0.95+cvs20040624-17)