diff --git a/sys/arch/mvme68k/stand/Makefile.inc b/sys/arch/mvme68k/stand/Makefile.inc
index 68e2b4ba2575..a47230b11d6d 100644
--- a/sys/arch/mvme68k/stand/Makefile.inc
+++ b/sys/arch/mvme68k/stand/Makefile.inc
@@ -1,3 +1,17 @@
-#	$NetBSD: Makefile.inc,v 1.3 1996/05/17 20:45:56 chuck Exp $
+#	$NetBSD: Makefile.inc,v 1.4 2000/07/09 13:47:33 jdolecek Exp $
 
 MDEC_DIR?=/usr/mdec
+
+CLEANFILES+= machine m68k
+
+.if defined(S)
+machine:
+	-rm -f $@
+	ln -s $S/arch/mvme68k/include machine
+
+m68k:
+	-rm -f $@
+	ln -s $S/arch/m68k/include m68k
+
+all: machine m68k
+.endif
diff --git a/sys/arch/mvme68k/stand/bootst/Makefile b/sys/arch/mvme68k/stand/bootst/Makefile
index 76945c2ee9e7..e7c79ace0fe2 100644
--- a/sys/arch/mvme68k/stand/bootst/Makefile
+++ b/sys/arch/mvme68k/stand/bootst/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$NetBSD: Makefile,v 1.6 2000/06/25 16:39:06 scw Exp $
+#	$NetBSD: Makefile,v 1.7 2000/07/09 13:47:33 jdolecek Exp $
 
 RELOC=0x3F0000 
 
@@ -15,18 +15,16 @@ CLEANFILES+=stboot bootst bootst.bug
 .include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc"
 .include "${S}/arch/mvme68k/stand/wrtvid/Makefile.inc"
 
+PROG=dummy
+MKMAN=no
 SRCS=   boot.c conf.c dev_tape.c rawfs.c version.c
 LIBS=	${LIBSA} ${LIBBUG}
-OBJS=   ${SRCS:S/.c/.o/g}
 
-realall:	bootst stboot
-
-bootst.bug:	${OBJS} ${BUGCRT} ${LIBS}
-	${LD} -s -N -T ${RELOC} ${BUGCRT} ${OBJS} ${LIBS} -o $@
+${PROG}: ${OBJS} ${BUGCRT} ${LIBS}
+	${LD} -s -N -T ${RELOC} ${BUGCRT} ${OBJS} ${LIBS} -o bootst.bug
 	@size bootst.bug
-
-bootst stboot: bootst.bug ${WRTVID}
-	${WRTVID} bootst.bug
+	@${WRTVID} bootst.bug # creates bootst  and stboot
+	touch ${PROG}
 
 install:
 	${INSTALL} -c -m 555 -g bin -o bin bootst ${DESTDIR}${MDEC_DIR}
diff --git a/sys/arch/mvme68k/stand/bootxx/bootxx.c b/sys/arch/mvme68k/stand/bootxx/bootxx.c
index 74f60dfc4565..bf3502b20ada 100644
--- a/sys/arch/mvme68k/stand/bootxx/bootxx.c
+++ b/sys/arch/mvme68k/stand/bootxx/bootxx.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootxx.c,v 1.2 1998/09/05 15:20:48 pk Exp $ */
+/*	$NetBSD: bootxx.c,v 1.3 2000/07/09 13:47:34 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@ int     	block_size = 512;	/* default */
 int     	block_count = MAXBLOCKNUM;	/* length of table */
 daddr_t 	block_table[MAXBLOCKNUM] = { 0 };
 
-extern		char *version;
+extern		char *bootprog_rev;
 
 
 main()
@@ -84,7 +84,8 @@ main()
 
 	printf("Boot: bug device: ctrl=%d, dev=%d\n", 
 		bugargs.ctrl_lun, bugargs.dev_lun);
-	printf("\nbootxx: first level bootstrap program [%s]\n\n", version);
+	printf("\nbootxx: first level bootstrap program [%s]\n\n",
+		bootprog_rev);
 
 	f.f_flags = F_RAW;
 	if (devopen(&f, 0, &addr)) {
diff --git a/sys/arch/mvme68k/stand/bugcrt/Makefile b/sys/arch/mvme68k/stand/bugcrt/Makefile
index 1d65dc3ed0f9..88f07c0ce929 100644
--- a/sys/arch/mvme68k/stand/bugcrt/Makefile
+++ b/sys/arch/mvme68k/stand/bugcrt/Makefile
@@ -1,19 +1,25 @@
-#	$NetBSD: Makefile,v 1.4 2000/06/25 16:39:07 scw Exp $
+#	$NetBSD: Makefile,v 1.5 2000/07/09 13:47:34 jdolecek Exp $
 #
 # DO NOT OPTMIZE bugcrt (i.e. no "-O2")
 #
-CFLAGS=-I${.CURDIR}/../../include -I${.CURDIR}/../libbug -fomit-frame-pointer
 
-OBJS=bugcrt.o
+S=      ${.CURDIR}/../../../..
+PROG= dummy
+MAN=
 
-CLEANFILES+=a.out
+CFLAGS=-I${.CURDIR}/../../include -I${.CURDIR}/../libbug -fomit-frame-pointer \
+	-I${S} -I.
+SRCS= bugcrt.c
+CLEANFILES+= bugcrt.o.tmp
 
-realall:	${OBJS}
+realall: ${OBJS}
 
 bugcrt.o: bugcrt.c
-	${CC} ${CFLAGS} -c ${.ALLSRC}
-	${LD} -x -r ${.TARGET}
-	mv a.out ${.TARGET}
+	${CC} ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}.tmp
+	${LD} -x -r ${.TARGET}.tmp -o ${.TARGET}
+
+${PROG}: ${OBJS}
+	@# empty
 
 proginstall::
 
diff --git a/sys/arch/mvme68k/stand/netboot/Makefile b/sys/arch/mvme68k/stand/netboot/Makefile
index d8debdd73651..ef6bbcf83bec 100644
--- a/sys/arch/mvme68k/stand/netboot/Makefile
+++ b/sys/arch/mvme68k/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2000/06/25 16:39:07 scw Exp $
+#	$NetBSD: Makefile,v 1.6 2000/07/09 13:47:34 jdolecek Exp $
 
 RELOC=0x3F0000
 
@@ -7,7 +7,7 @@ DEFS= -DSUN_BOOTPARAMS
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${S} -I${S}/lib/libsa
 CFLAGS=	-O2 ${INCPATH} ${DEFS} ${COPTS}
-CLEANFILES+=netboot netboot.bin
+CLEANFILES+=netboot.tmp
 
 .include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc"
 .include "${S}/arch/mvme68k/stand/libbug/Makefile.inc"
@@ -15,26 +15,23 @@ CLEANFILES+=netboot netboot.bin
 
 SRCS=   boot.c conf.c version.c devopen.c dev_net.c
 SRCS+=	if_ie.c if_le.c
-OBJS=  ${SRCS:S/.c/.o/g}
+PROG= netboot.bin
+MKMAN=no
 
-realall:	netboot.bin
-
-netboot: ${OBJS} ${LIBSA} ${BUGCRT} ${LIBBUG}
-	${LD} -s -N -T ${RELOC} -o $@ \
+${PROG}: ${OBJS} ${LIBSA} ${BUGCRT} ${LIBBUG}
+	${LD} -s -N -T ${RELOC} -o netboot.tmp \
 		${SRTOBJ} ${BUGCRT} ${OBJS} ${LIBSA} ${LIBBUG}
-	@size $@
-
-netboot.bin: netboot
-	dd ibs=32 skip=1 if=netboot of=$@
+	@size netboot.tmp
+	dd ibs=32 skip=1 if=netboot.tmp of=$@
 
 install:
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	  netboot.bin ${DESTDIR}${MDEC_DIR}/netboot
 
-afterdepend:	.depend
-	@(TMP=/tmp/_depend$$$$; \
-		sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o s\1.o:/' \
-		< .depend > $$TMP; \
-	mv $$TMP .depend)
-
+#afterdepend:	.depend
+#	@(TMP=/tmp/_depend$$$$; \
+#		sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o s\1.o:/' \
+#		< .depend > $$TMP; \
+#	mv $$TMP .depend)
+#
 .include <bsd.prog.mk>
diff --git a/sys/arch/mvme68k/stand/sboot/Makefile b/sys/arch/mvme68k/stand/sboot/Makefile
index 80bf6637b84e..79dcabd53612 100644
--- a/sys/arch/mvme68k/stand/sboot/Makefile
+++ b/sys/arch/mvme68k/stand/sboot/Makefile
@@ -1,23 +1,25 @@
-#	$NetBSD: Makefile,v 1.6 2000/06/25 16:39:07 scw Exp $
+#	$NetBSD: Makefile,v 1.7 2000/07/09 13:47:34 jdolecek Exp $
 
 #
 # sboot would like a newer GNU ld because it can generate S-Records.
 # Until then, we convert.
 #
 
+S=${.CURDIR}/../../../..
+
 COMPILE.s= $(AS) $(ASFLAGS) -o $*.o
 LDFLAGS=-x -N -Ttext 0x4000 -e start
 MKMAN=	no
 SRCS=	start.s clock.c console.c etherfun.c le_poll.c libc_sa.c \
 		oc_cksum.s sboot.c
-OBJS=	${SRCS:N*.h:R:S/$/.o/g}
 CLEANFILES+= srec sboot sboot.srec
 
 BOOTS=	sboot.srec
+PROG=${BOOTS}
 
-realall: ${BOOTS}
-
-sboot.srec: sboot srec
+${PROG}: ${OBJS}
+	${MAKE} sboot
+	${MAKE} srec
 	dd ibs=32 skip=1 if=sboot | ${.OBJDIR}/srec 4 0x4000 sboot > ${.TARGET}
 
 sboot: ${OBJS}
diff --git a/sys/arch/mvme68k/stand/wrtvid/Makefile b/sys/arch/mvme68k/stand/wrtvid/Makefile
index d0cb08673e0c..06848bfebae3 100644
--- a/sys/arch/mvme68k/stand/wrtvid/Makefile
+++ b/sys/arch/mvme68k/stand/wrtvid/Makefile
@@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.3 1999/02/13 02:54:47 lukem Exp $
+#	$NetBSD: Makefile,v 1.4 2000/07/09 13:47:34 jdolecek Exp $
 
+S=${.CURDIR}/../../../../
 PROG=	wrtvid
 MKMAN=	no