diff --git a/cdrom/waboot/register.pl b/cdrom/waboot/register.pl
index 745d481c0b7cc39163c9995075333d5c4e6c6b6f..78c9a6828108e653e7b286ee0147bd1fdf52ab7a 100755
--- a/cdrom/waboot/register.pl
+++ b/cdrom/waboot/register.pl
@@ -318,9 +318,9 @@ for ($i = 1; $i <= 4; $i++) {
 
 	if ($showprogress) {
 	    print "(Output indicates uncompressed bytes written to disk.)\n";
-	    system("imageunzip -o -s $i -d /$image $rawbootdisk");
+	    system("imageunzip -o -s $i /$image $rawbootdisk");
 	} else {
-	    mysystem("imageunzip -s $i -d /$image $rawbootdisk");
+	    mysystem("imageunzip -s $i /$image $rawbootdisk");
 	}
 	fatal("Failed to lay down image /$image!")
 	    if ($?);
@@ -465,7 +465,7 @@ FinishedInstructions();
 # One last chance to hold things up.
 # 
 if (Prompt("Reboot from ${rawbootdisk}?", "Yes", 10) =~ /yes/i) {
-    mysystem("reboot");
+    mysystem("shutdown -r now");
     fatal("Failed to reboot!")
 	if ($?);
     sleep(100000);
@@ -706,6 +706,7 @@ sub MakeFS($$)
     }
 
     print "Creating filesystem on $mntpoint (${rawdevice}s${slice}e).\n";
+    print "    (ignore kernel generated \"no disk label\" messages.)\n";
     mysystem("newfs -U ${rawdevice}s${slice}e");
     if ($?) {
 	print STDERR "*** Oops, could not newfs ${rawdevice}s${slice}e!\n";
diff --git a/cdrom/waboot/register.sh b/cdrom/waboot/register.sh
index aeb354dc13b28cd49b62c88e6c91116e8badfc9a..85c96e109f64fbc90a4e3905096cfbf02426eb51 100755
--- a/cdrom/waboot/register.sh
+++ b/cdrom/waboot/register.sh
@@ -21,8 +21,10 @@ start)
 		exit $?
 	fi
 	;;
+stop)
+	;;
 *)
-	echo "Usage: `basename $0` {start}" >&2
+	echo "Usage: `basename $0` {start|stop}" >&2
 	exit 1
 	;;
 esac