diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config
index 8a6742e39..341ff418a 100644
--- a/debian/arch/hppa/config
+++ b/debian/arch/hppa/config
@@ -808,3 +808,4 @@ CONFIG_MEGARAID_MAILBOX=m
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_IPW2100 is not set
+# CONFIG_DETECT_SOFTLOCKUP is not set
diff --git a/debian/changelog b/debian/changelog
index cd0ce2ad7..e73037163 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ linux-2.6 (2.6.16+2.6.17-rc5-0experimental.1) UNRELEASED; urgency=low
   [ Martin Michlmayr ]
   * [mips] Update patches for 2.6.17.
 
+  [ Kyle McMartin ]
+  * [hppa] Disable CONFIG_DETECT_SOFTLOCKUP to fix pa8800 boot.
+
  -- Bastian Blank <waldi@debian.org>  Thu, 25 May 2006 14:13:12 +0200
 
 linux-2.6 (2.6.16+2.6.17-rc3-0experimental.1) experimental; urgency=low