diff --git a/data/sarge/yaboot/yaboot.conf b/data/sarge/yaboot/yaboot.conf
index 79717e53..ac0024a6 100644
--- a/data/sarge/yaboot/yaboot.conf
+++ b/data/sarge/yaboot/yaboot.conf
@@ -4,7 +4,6 @@
 # It is important not to have a comma after cd:
 device=cd:
 default=install
-timeout=100
 
 # FIXME: will this be the correct path?
 message=/install/boot.msg
diff --git a/debian/changelog b/debian/changelog
index e1b2f478..9c7243f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -80,6 +80,8 @@ debian-cd (2.2.21) UNRELEASED; urgency=low
   * Bdale Garbee
     - update tasks and tools to make 2.6.8 kernels primary on hppa
     - add ramdisk_size=16384 to palo call in post-boot-hppa 
+  * Colin Watson
+    - Disable CD timeout on powerpc.
 
  -- Bdale Garbee <bdale@gag.com>  Sat, 15 Jan 2005 21:33:48 -0700