diff --git a/squeeze/data/squeeze/yaboot/boot.msg b/squeeze/data/squeeze/yaboot/boot.msg
index 32cb54be..fe9a2b9d 100644
--- a/squeeze/data/squeeze/yaboot/boot.msg
+++ b/squeeze/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/squeeze/debian/changelog b/squeeze/debian/changelog
index d7dda065..a3897b5c 100644
--- a/squeeze/debian/changelog
+++ b/squeeze/debian/changelog
@@ -6,6 +6,8 @@ debian-cd (3.1.6) UNRELEASED; urgency=low
   [ backports from trunk ]
   * Remove win32-loader standalone flavours from the tools/ directory on
     x86. Closes: #612224
+  * In the boot prompt for powerpc, make install64 more prominent.
+    Closes: #614583
 
  -- Raphaël Hertzog <hertzog@debian.org>  Fri, 04 Feb 2011 09:59:21 +0100