diff --git a/debian/arch/amd64/config.amd64-k8-smp b/debian/arch/amd64/config.amd64-k8-smp
index d1363882a..a6370ce26 100644
--- a/debian/arch/amd64/config.amd64-k8-smp
+++ b/debian/arch/amd64/config.amd64-k8-smp
@@ -33,5 +33,5 @@ CONFIG_DIGIEPCA=m
 CONFIG_MKISS=m
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_DISCONTIGMEM_MANUAL=y
diff --git a/debian/changelog b/debian/changelog
index 87cc2b725..e18e730b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ linux-2.6 (2.6.14-2) UNRELEASED; urgency=low
   * [alpha] New patch to include compiler.h in barrier.h, barrier() is used in
     non-SMP case.
 
+  [ Frederik Schüler ]
+  * [amd64] use DISCONTIGMEM instead of SPARSEMEM on amd64-k8-smp flavour to
+    fix bootup kernel panic.
+
  -- Norbert Tretkowski <nobse@debian.org>  Fri, 28 Oct 2005 19:26:34 +0200
 
 linux-2.6 (2.6.14-1) unstable; urgency=low