diff --git a/sys/arch/amd64/amd64/autoconf.c b/sys/arch/amd64/amd64/autoconf.c
index 54e342974599..b1f83d243fc9 100644
--- a/sys/arch/amd64/amd64/autoconf.c
+++ b/sys/arch/amd64/amd64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.8 2004/09/17 14:11:21 skrll Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.9 2004/10/15 06:18:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.8 2004/09/17 14:11:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.9 2004/10/15 06:18:48 thorpej Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -291,7 +291,7 @@ match_harddisk(dv, bid)
 	 * Fake a temporary vnode for the disk, open
 	 * it, and read the disklabel for comparison.
 	 */
-	if (bdevvp(MAKEDISKDEV(bmajor, dv->dv_unit, bid->partition), &tmpvn))
+	if (bdevvp(MAKEDISKDEV(bmajor, dv->dv_unit, RAW_PART), &tmpvn))
 		panic("findroot can't alloc vnode");
 	error = VOP_OPEN(tmpvn, FREAD, NOCRED, 0);
 	if (error) {
@@ -313,8 +313,8 @@ match_harddisk(dv, bid)
 		 * XXX can't happen - open() would
 		 * have errored out (or faked up one)
 		 */
-		printf("can't get label for dev %s%c (%d)\n",
-		       dv->dv_xname, 'a' + bid->partition, error);
+		printf("can't get label for dev %s (%d)\n",
+		       dv->dv_xname, error);
 		goto closeout;
 	}
 
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index cb33f520d3a2..22d65eaab160 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.78 2004/09/17 14:11:21 skrll Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.79 2004/10/15 06:18:47 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.78 2004/09/17 14:11:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.79 2004/10/15 06:18:47 thorpej Exp $");
 
 #include "opt_compat_oldboot.h"
 #include "opt_multiprocessor.h"
@@ -329,7 +329,7 @@ match_harddisk(struct device *dv, struct btinfo_bootdisk *bid)
 	 * Fake a temporary vnode for the disk, open
 	 * it, and read the disklabel for comparison.
 	 */
-	if (bdevvp(MAKEDISKDEV(bmajor, dv->dv_unit, bid->partition), &tmpvn))
+	if (bdevvp(MAKEDISKDEV(bmajor, dv->dv_unit, RAW_PART), &tmpvn))
 		panic("findroot can't alloc vnode");
 	error = VOP_OPEN(tmpvn, FREAD, NOCRED, 0);
 	if (error) {
@@ -351,8 +351,8 @@ match_harddisk(struct device *dv, struct btinfo_bootdisk *bid)
 		 * XXX can't happen - open() would
 		 * have errored out (or faked up one)
 		 */
-		printf("can't get label for dev %s%c (%d)\n",
-		       dv->dv_xname, 'a' + bid->partition, error);
+		printf("can't get label for dev %s (%d)\n",
+		       dv->dv_xname, error);
 		goto closeout;
 	}