diff --git a/sys/arch/hp300/stand/Makefile.buildboot b/sys/arch/hp300/stand/Makefile.buildboot
index dc0369c83ad8..231d236d0aa7 100644
--- a/sys/arch/hp300/stand/Makefile.buildboot
+++ b/sys/arch/hp300/stand/Makefile.buildboot
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.buildboot,v 1.11 2000/01/23 17:04:05 mycroft Exp $
+#	$NetBSD: Makefile.buildboot,v 1.12 2000/12/16 04:20:24 simonb Exp $
 
 S=		${.CURDIR}/../../../..
 
@@ -31,6 +31,13 @@ CFLAGS=		-Os -msoft-float
 CPPFLAGS+=	-DBOOT_AOUT
 #CPPFLAGS+=	-DBOOT_ELF
 
+SRCS+=		vers.c
+CLEANFILES+=	vers.c
+
+.PHONY: vers.c
+vers.c: ${.CURDIR}/version
+	sh ${S}/conf/newvers_stand.sh ${.CURDIR}/version hp300 ${NEWVERSWHAT}
+
 ${PROG}: ${PROGAOUT} ${MKBOOT_PROG}
 	${MKBOOT_PROG} ${PROGAOUT} ${PROG}
 
@@ -54,9 +61,7 @@ SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
 LIBSA=		${SALIB}
 
 ${PROGAOUT}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
-	sh ${.CURDIR}/../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
-	${COMPILE.c} vers.c
-	${LD} -N -T ${RELOC} -e begin -o ${PROGAOUT} \
-	    ${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBKERN}
+	${LD} -N -Ttext ${RELOC} -e begin -o ${PROGAOUT} \
+	    ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 	@size ${PROGAOUT}
 	@echo ${PROGAOUT} total size should not exceed 1044480 bytes
diff --git a/sys/arch/hp300/stand/common/newvers.sh b/sys/arch/hp300/stand/common/newvers.sh
deleted file mode 100644
index 065dc839d639..000000000000
--- a/sys/arch/hp300/stand/common/newvers.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh -
-#
-#	$NetBSD: newvers.sh,v 1.1 1997/02/04 03:52:41 thorpej Exp $
-#
-# Copyright (c) 1984, 1986, 1990, 1993
-#	The Regents of the University of California.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by the University of
-#	California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-
-u=${USER-root} h=`hostname` t=`date`
-r=`head -1 $1 | awk ' { print $3 } '`
-
-echo "char bootprog_name[] = \"NetBSD/hp300 ${2}\";" > vers.c
-echo "char bootprog_rev[] = \"${r}\";" >> vers.c
-echo "char bootprog_date[] = \"${t}\";" >> vers.c
-echo "char bootprog_maker[] = \"${u}@${h}\";" >> vers.c