diff --git a/debian/arch/amd64/defines b/debian/arch/amd64/defines
index 0957b3287..1f3cea6f5 100644
--- a/debian/arch/amd64/defines
+++ b/debian/arch/amd64/defines
@@ -6,7 +6,7 @@ flavours:
  em64t-p4
  em64t-p4-smp
 kernel-arch: x86_64
-kernel-header-dirs: x86_64
+kernel-header-dirs: x86_64 i386
 subarches:
  vserver
  xen
diff --git a/debian/changelog b/debian/changelog
index e0a3710b9..04813f449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,20 @@
 linux-2.6 (2.6.16-99experimental.1) UNRELEASED; urgency=low
 
-  [ Bastian Blank ]
   *
 
-  [ Jonas Smedegaard ]
-  * Tighten yaird dependency to at least 0.0.12-8 (supporting
-    Linux 2.6.16 uppercase hex in Kconfig and new IDE sysfs naming, and
-    VIA IDE on powerpc).
+ -- Bastian Blank <waldi@debian.org>  Thu, 23 Mar 2006 21:40:17 +0100
 
- -- Jonas Smedegaard <dr@jones.dk>  Thu, 23 Mar 2006 12:23:22 +0100
+linux-2.6 (2.6.16-3) UNRELEASED; urgency=low
+
+  [ Frederik Schüler ]
+  * [amd64] Add asm-i386 to the linux-headers packages.
+
+  [ Jonas Smedegaard ]
+  * Tighten yaird dependency to at least 0.0.12-8 (supporting Linux
+    2.6.16 uppercase hex in Kconfig and new IDE sysfs naming, and VIA
+    IDE on powerpc).
+
+ -- Frederik Schüler <fs@debian.org>  Thu, 23 Mar 2006 18:47:46 +0100
 
 linux-2.6 (2.6.16-2) unstable; urgency=low