diff --git a/data/etch/yaboot/boot.msg b/data/etch/yaboot/boot.msg
index 292e5251..32cb54be 100644
--- a/data/etch/yaboot/boot.msg
+++ b/data/etch/yaboot/boot.msg
@@ -11,10 +11,11 @@ symptom is a white screen which doesn't go away),
 use 'install video=ofonly' or 'expert video=ofonly'.
 
 The plain options are for the powerpc family of
-processors (from 601 to G4). The *-power3 options
-are for IBM Power3 boxes, and the *-power4 options
-are for IBM Power4 and Apple G5 boxes. Press the tab
-key for a list of options, or type 'help' for help.
+processors (from 601 to G4). The *64 options are for
+64bit powerpc processors, which include the IBM 
+Power3, Power4, Power5, ... boxes, as well as the 
+Apple G5 boxes. Press the tab key for a list of
+options, or type 'help' for help.
 
 ************************************
 If in doubt, just choose 'install', and if that 
diff --git a/data/etch/yaboot/yaboot.conf b/data/etch/yaboot/yaboot.conf
index ac0024a6..d4abd509 100644
--- a/data/etch/yaboot/yaboot.conf
+++ b/data/etch/yaboot/yaboot.conf
@@ -2,104 +2,42 @@
 ## Debian GNU/Linux PowerPC (CODENAME)
 
 # It is important not to have a comma after cd:
-device=cd:
+# Let's disable this one for now, as it breaks on IBM 64bit boxes,
+# Not sure if it is ok on powermacs, but yaboot should be able to 
+# parse that from chosen/bootpath.
+# device=cd:
 default=install
 
 # FIXME: will this be the correct path?
 message=/install/boot.msg
 
-# Powerpc subarch 
+# PowerPC subarch 
 image=/install/powerpc/vmlinux
-	label=install-powerpc
-	alias=install
+	label=install
 	initrd=/install/powerpc/initrd.gz
 	append="devfs=mount,dall init=/linuxrc --"
 	initrd-size=10240
 	read-only
 
 image=/install/powerpc/vmlinux
-	label=expert-powerpc
-	alias=expert
+	label=expert
 	initrd=/install/powerpc/initrd.gz
 	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
 	initrd-size=10240
 	read-only
 
-# Power3 subarch
-image=/install/power3/vmlinux
-	label=install-power3
-	initrd=/install/power3/initrd.gz
+# PowerPC 64bit subarch
+image=/install/powerpc64/vmlinux
+	label=install64
+	initrd=/install/powerpc64/initrd.gz
 	append="devfs=mount,dall init=/linuxrc --"
 	initrd-size=10240
 	read-only
 
-image=/install/power3/vmlinux
-	label=expert-power3
-	initrd=/install/power3/initrd.gz
+image=/install/powerpc64/vmlinux
+	label=expert64
+	initrd=/install/powerpc64/initrd.gz
 	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
 	initrd-size=10240
 	read-only
 
-# Power 4 subarch
-image=/install/power4/vmlinux
-	label=install-power4
-	initrd=/install/power4/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=10240
-	read-only
-
-image=/install/power4/vmlinux
-	label=expert-power4
-	initrd=/install/power4/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=10240
-	read-only
-
-# ... and now massive clone-and-hack for 2.4 ...
-
-# Powerpc subarch 
-image=/install/powerpc/2.4/vmlinux
-	label=install-powerpc-2.4
-	alias=install-2.4
-	initrd=/install/powerpc/2.4/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
-
-image=/install/powerpc/2.4/vmlinux
-	label=expert-powerpc-2.4
-	alias=expert-2.4
-	initrd=/install/powerpc/2.4/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
-
-# Power3 subarch
-image=/install/power3/2.4/vmlinux
-	label=install-power3-2.4
-	initrd=/install/power3/2.4/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
-
-image=/install/power3/2.4/vmlinux
-	label=expert-power3-2.4
-	initrd=/install/power3/2.4/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
-
-# Power 4 subarch
-image=/install/power4/2.4/vmlinux
-	label=install-power4-2.4
-	initrd=/install/power4/2.4/initrd.gz
-	append="devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only
-
-image=/install/power4/2.4/vmlinux
-	label=expert-power4-2.4
-	initrd=/install/power4/2.4/initrd.gz
-	append="DEBCONF_PRIORITY=low devfs=mount,dall init=/linuxrc --"
-	initrd-size=8192
-	read-only