--- /n/sources/plan9/sys/lib/dist/pc/inst/bootsetup	Sun Oct 10 13:23:20 2010
+++ /sys/lib/dist/pc/inst/bootsetup	Sat May 12 00:00:00 2012
@@ -22,13 +22,32 @@
 	if(! test -f /tmp/plan9.ini) {
 		{
 			sfs=`{echo $fs | sed 's;/dev;#S;'}
+			echo [menu]
+			echo menuitem'='pcf, pcf
+			echo menuitem'='pccpuf, pccpuf
+			echo menuitem'='k8, k8cpu
+			echo menudefault'='pc, 10
+			echo
+			echo [pcf]
 			if(~ $fstype fossil fossil+venti){
 				echo bootfile'='$bootfat!9pcf
+				echo
+				echo [pccpuf]
+				echo bootfile'='$bootfat!9pccpuf
+			}
+			if not {
+				echo bootfile'='$bootfs!/386/9pcdisk
+			}
+			echo
+			echo [k8]
+				echo bootfile'='$bootfs!/amd64/k8cpu
+			echo
+			echo [common]
+			if(~ $fstype fossil fossil+venti){
 				echo 'bootargs=local!'^$sfs
 				echo 'bootdisk=local!'^$sfs
 			}
 			if not {
-				echo bootfile'='$bootfs!/386/9pcdisk
 				echo 'bootdisk=local!'^$sfs
 			}
 			if(~ $fstype fossil+venti){
@@ -84,6 +103,8 @@
 	if(! test -f /n/9fat/4e){
 		logprog cp /n/newfs/386/9load /n/9fat/9load
 		logprog cp /n/newfs/386/9pcf /n/9fat/9pcf
+		logprog cp /n/newfs/386/9pccpuf /n/9fat/9pccpuf
+		logprog cp /n/newfs/amd64/9k8cpu /n/9fat/9k8cpu
 		if(test -f /n/9fat/plan9.ini && ! test -f /n/9fat/plan9-3e.ini)
 			logprog mv /n/9fat/plan9.ini /n/9fat/plan9-3e.ini
 		if(test -f /n/9fat/9pcdisk && ! test -f /n/9fat/9pc3e)