diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config
index 07310dc2a..e792395ae 100644
--- a/debian/arch/ia64/config
+++ b/debian/arch/ia64/config
@@ -33,7 +33,7 @@ CONFIG_HOLES_IN_ZONE=y
 CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
 # CONFIG_IA64_CYCLONE is not set
 CONFIG_IOSAPIC=y
-CONFIG_IA64_SGI_SN_XP=m
+# CONFIG_IA64_SGI_SN_XP is not set
 CONFIG_FORCE_MAX_ZONEORDER=18
 CONFIG_IA32_SUPPORT=y
 CONFIG_COMPAT=y
diff --git a/debian/changelog b/debian/changelog
index cc1371c60..620273393 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,16 @@ linux-2.6 (2.6.13+2.6.14-rc5-0experimental.2) UNRELEASED; urgency=low
 
   [ Simon Horman ]
   * Fix misformatting of long description of
-    linux-patch-debian-linux-patch-debian-X.Y.Z. 
+    linux-patch-debian-linux-patch-debian-X.Y.Z.
     templates/control.main.in
     (closes: #335088)
 
- -- Simon Horman <horms@debian.org>  Wed, 26 Oct 2005 15:36:56 +0900
+  [ dann frazier ]
+  * [ia64] Disable the CONFIG_IA64_SGI_SN_XP module.  This forces
+    CONFIG_GENERIC_ALLOCATOR and CONFIG_IA64_UNCACHED_ALLOCATOR to y, which
+    appears to break on zx1 systems.
+
+ -- dann frazier <dannf@debian.org>  Wed, 26 Oct 2005 14:24:22 -0600
 
 linux-2.6 (2.6.13+2.6.14-rc5-0experimental.1) experimental; urgency=low