diff --git a/sys/arch/hp300/stand/Makefile.buildboot b/sys/arch/hp300/stand/Makefile.buildboot
index 74f0245e5d8e..accd250b84cc 100644
--- a/sys/arch/hp300/stand/Makefile.buildboot
+++ b/sys/arch/hp300/stand/Makefile.buildboot
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.buildboot,v 1.26 2005/12/11 12:17:19 christos Exp $
+#	$NetBSD: Makefile.buildboot,v 1.27 2008/07/16 13:44:51 tsutsui Exp $
 
 # RELOC=FFF00000 allows for boot prog up to FF000 (1044480) bytes long
 RELOC=	FFF00000
@@ -34,7 +34,8 @@ LIBCRTEND=
 
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version hp300 ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh \
+		-DM ${.CURDIR}/version ${MACHINE} ${NEWVERSWHAT}
 
 ${PROG}: ${PROGAOUT}
 	${OBJCOPY} --output-target=binary ${PROGAOUT} ${PROGAOUT}.bin
diff --git a/sys/arch/hp300/stand/common/samachdep.h b/sys/arch/hp300/stand/common/samachdep.h
index 6bf974e2cec5..9bb27f856cbb 100644
--- a/sys/arch/hp300/stand/common/samachdep.h
+++ b/sys/arch/hp300/stand/common/samachdep.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: samachdep.h,v 1.15 2007/03/04 05:59:50 christos Exp $	*/
+/*	$NetBSD: samachdep.h,v 1.16 2008/07/16 13:44:51 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -132,5 +132,4 @@ extern	struct fs_ops file_system_rawfs[];
 extern	struct fs_ops file_system_ufs[];
 extern	struct fs_ops file_system_nfs[];
 
-extern	char bootprog_name[], bootprog_rev[], bootprog_date[],
-	    bootprog_maker[];
+extern	char bootprog_name[], bootprog_rev[], bootprog_kernrev[];
diff --git a/sys/arch/hp300/stand/inst/inst.c b/sys/arch/hp300/stand/inst/inst.c
index 7b95793f97ef..3b13941c84b1 100644
--- a/sys/arch/hp300/stand/inst/inst.c
+++ b/sys/arch/hp300/stand/inst/inst.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: inst.c,v 1.17 2008/04/28 20:23:19 martin Exp $	*/
+/*	$NetBSD: inst.c,v 1.18 2008/07/16 13:44:51 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -123,8 +123,8 @@ main(void)
 	netio_ask = 1;
 
 	printf("\n");
-	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+	printf(">> %s, Revision %s (from NetBSD %s)\n",
+	    bootprog_name, bootprog_rev, bootprog_kernrev);
 	printf(">> HP 9000/%s SPU\n", getmachineid());
 	gethelp();
 
diff --git a/sys/arch/hp300/stand/inst/version b/sys/arch/hp300/stand/inst/version
index 0c3394f69e85..8e70f07ecf5f 100644
--- a/sys/arch/hp300/stand/inst/version
+++ b/sys/arch/hp300/stand/inst/version
@@ -1,10 +1,11 @@
-$NetBSD: version,v 1.8 2006/07/20 13:21:38 tsutsui Exp $
+$NetBSD: version,v 1.9 2008/07/16 13:44:51 tsutsui Exp $
 
-1.1:		Initial version
-1.2:		Added support for HP-IB cartridge tapes
-1.3:		Reorganization of boot block code
-1.4:		Add support for reading gzip'd miniroot images
-1.5:		Round load address to 8k boundary
-1.6:		Better SPU detection code
-1.7:		Added APCI console support
-1.8:		Identify HP362 and HP382
+1.1:	Initial version
+1.2:	Added support for HP-IB cartridge tapes
+1.3:	Reorganization of boot block code
+1.4:	Add support for reading gzip'd miniroot images
+1.5:	Round load address to 8k boundary
+1.6:	Better SPU detection code
+1.7:	Added APCI console support
+1.8:	Identify HP362 and HP382
+1.9:	Change boot messages to replace build date and maker with kernrev.
diff --git a/sys/arch/hp300/stand/uboot/uboot.c b/sys/arch/hp300/stand/uboot/uboot.c
index b06448830ad4..b71a2d6cfa74 100644
--- a/sys/arch/hp300/stand/uboot/uboot.c
+++ b/sys/arch/hp300/stand/uboot/uboot.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uboot.c,v 1.14 2005/12/24 22:45:35 perry Exp $	*/
+/*	$NetBSD: uboot.c,v 1.15 2008/07/16 13:44:51 tsutsui Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -75,8 +75,8 @@ main(void)
 	int currname = 0;
 
 	printf("\n");
-	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);  
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+	printf(">> %s, Revision %s (from NetBSD %s)\n",
+	    bootprog_name, bootprog_rev, bootprog_kernrev);
 	printf(">> HP 9000/%s SPU\n", getmachineid());
 	printf(">> Enter \"reset\" to reset system.\n");
 
diff --git a/sys/arch/hp300/stand/uboot/version b/sys/arch/hp300/stand/uboot/version
index 7ffeeae2c687..23cd9e4ff4a5 100644
--- a/sys/arch/hp300/stand/uboot/version
+++ b/sys/arch/hp300/stand/uboot/version
@@ -1,18 +1,18 @@
-$NetBSD: version,v 1.15 2006/07/20 13:21:38 tsutsui Exp $
+$NetBSD: version,v 1.16 2008/07/16 13:44:51 tsutsui Exp $
 
-1.1:		Initial version
-1.2:		Added support for network booting
-1.3:		Merged network and disk boot programs
-1.4:		Added support for HP-IB cartridge tapes
-1.5:		Reorganization of boot block code
-1.6:		Add support for booting gzip'd kernels
-1.7:		Round load address to 8k boundary
-1.8:		Better SPU detection code
-1.9:		Added APCI console support
-1.10:		Support verbose/quiet boot.
-1.11:		ELF support.
-1.12:		loadfile() update:  ELF symbols no longer need backward seeks.
-1.13:		loadfile() update to avoid backwards seeks for ELF Program
-		Headers.
-1.14:		Default to BOOTP network boot
-1.15:		Identify HP362 and HP382
+1.1:	Initial version
+1.2:	Added support for network booting
+1.3:	Merged network and disk boot programs
+1.4:	Added support for HP-IB cartridge tapes
+1.5:	Reorganization of boot block code
+1.6:	Add support for booting gzip'd kernels
+1.7:	Round load address to 8k boundary
+1.8:	Better SPU detection code
+1.9:	Added APCI console support
+1.10:	Support verbose/quiet boot.
+1.11:	ELF support.
+1.12:	loadfile() update:  ELF symbols no longer need backward seeks.
+1.13:	loadfile() update to avoid backwards seeks for ELF Program Headers.
+1.14:	Default to BOOTP network boot
+1.15:	Identify HP362 and HP382
+1.16:	Change boot messages to replace build date and maker with kernrev.