diff --git a/data/squeeze/yaboot/boot.msg b/data/squeeze/yaboot/boot.msg
index 32cb54be..fe9a2b9d 100644
--- a/data/squeeze/yaboot/boot.msg
+++ b/data/squeeze/yaboot/boot.msg
@@ -3,21 +3,16 @@ Welcome to Debian GNU/Linux ${DEBIAN_VERSION}!
 This is a Debian installation ${MEDIA_TYPE},
 built on ${BUILD_DATE}.
 
-The default option is 'install'. For maximum
-control, you can use the 'expert' option.
+Enter one of the following options to begin:
+
+install     32-bit processor (G4 or earlier)
+install64   64-bit processor (G5 or IBM POWER3/4/5)
+expert      expert mode on 32-bit processor
+expert64    expert mode on 64-bit processor
 
 If the system fails to boot at all (the typical
 symptom is a white screen which doesn't go away),
-use 'install video=ofonly' or 'expert video=ofonly'.
+add 'video=ofonly'.
 
-The plain options are for the powerpc family of
-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 
-doesn't work, try 'install video=ofonly'.
-************************************
+Press the Tab key for a full list of options, or enter
+'help' for help.
diff --git a/data/wheezy/yaboot/boot.msg b/data/wheezy/yaboot/boot.msg
index 32cb54be..fe9a2b9d 100644
--- a/data/wheezy/yaboot/boot.msg
+++ b/data/wheezy/yaboot/boot.msg
@@ -3,21 +3,16 @@ Welcome to Debian GNU/Linux ${DEBIAN_VERSION}!
 This is a Debian installation ${MEDIA_TYPE},
 built on ${BUILD_DATE}.
 
-The default option is 'install'. For maximum
-control, you can use the 'expert' option.
+Enter one of the following options to begin:
+
+install     32-bit processor (G4 or earlier)
+install64   64-bit processor (G5 or IBM POWER3/4/5)
+expert      expert mode on 32-bit processor
+expert64    expert mode on 64-bit processor
 
 If the system fails to boot at all (the typical
 symptom is a white screen which doesn't go away),
-use 'install video=ofonly' or 'expert video=ofonly'.
+add 'video=ofonly'.
 
-The plain options are for the powerpc family of
-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 
-doesn't work, try 'install video=ofonly'.
-************************************
+Press the Tab key for a full list of options, or enter
+'help' for help.
diff --git a/debian/changelog b/debian/changelog
index f88b3c12..df8ae44e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-cd (3.1.6) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * In the boot prompt for powerpc, make install64 more prominent.
+    Closes: #614583
+
+ -- Steve McIntyre <93sam@debian.org>  Sun, 06 Mar 2011 19:16:00 +0000
+
 debian-cd (3.1.6) unstable; urgency=low
 
   [ Raphaël Hertzog ]