diff --git a/sys/arch/sparc/stand/Makefile b/sys/arch/sparc/stand/Makefile
index fa4db2db16e9..5d3bd6162408 100644
--- a/sys/arch/sparc/stand/Makefile
+++ b/sys/arch/sparc/stand/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 1995/10/05 21:03:12 pk Exp $
+#	$NetBSD: Makefile,v 1.10 1995/10/09 23:25:54 pk Exp $
 
 SUBDIR= boot bootxx installboot
 
@@ -14,6 +14,15 @@ all: ${SALIB} ${KERNLIB} _SUBDIRUSE
 libdep:
 	@echo  ${.OBJDIR}/${SALIB} ${.OBJDIR}/${KERNLIB}
 
+sadep:
+	@echo  ${.OBJDIR}/${SALIB}
+
+kernlibdir:
+	@echo  ${.OBJDIR}/${KERNDST}
+
+salibdir:
+	@echo  ${.OBJDIR}/${SADST}
+
 clean:: _SUBDIRUSE
 
 cleandir: _SUBDIRUSE
diff --git a/sys/arch/sparc/stand/Makefile.inc b/sys/arch/sparc/stand/Makefile.inc
index 1fd89770126a..a083047b0d1e 100644
--- a/sys/arch/sparc/stand/Makefile.inc
+++ b/sys/arch/sparc/stand/Makefile.inc
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile.inc,v 1.3 1995/09/30 21:43:36 pk Exp $
+#	$NetBSD: Makefile.inc,v 1.4 1995/10/09 23:25:55 pk Exp $
 
 .if !defined(__stand_makefile_inc)
 __stand_makefile_inc=1
 
 S= ${.CURDIR}/../../../${R}
 
-.if !make(libdep)
+.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir)
 .BEGIN:
 	@([ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine)
 .endif
diff --git a/sys/arch/sparc/stand/bootxx/Makefile b/sys/arch/sparc/stand/bootxx/Makefile
index 4a9cfbac0e5d..cfde02820818 100644
--- a/sys/arch/sparc/stand/bootxx/Makefile
+++ b/sys/arch/sparc/stand/bootxx/Makefile
@@ -1,18 +1,21 @@
-#	$NetBSD: Makefile,v 1.3 1995/09/30 21:43:40 pk Exp $
+#	$NetBSD: Makefile,v 1.4 1995/10/09 23:25:57 pk Exp $
 
 R=	..
 .PATH:	${.CURDIR}/${R}
 PROG=	bootxx
 SRCS=	srt0.S bootxx.c promdev.c dvma.c
+KOBJS=	__main.o bzero.o rem.o urem.o udiv.o
 NOMAN=	1
 STRIP=
 BINDIR=	/usr/mdec
-LIBS!=	cd ${.CURDIR}/${R}; ${MAKE} libdep
-
 CFLAGS= -DBOOTXX
 
-${PROG}:${OBJS} ${LIBS}
-	${LD} -N -T ${RELOC} -e start ${OBJS} ${LIBS}
+LIBS!=	cd ${.CURDIR}/${R}; ${MAKE} sadep
+KOBJDIR!= cd ${.CURDIR}/${R}; ${MAKE} kernlibdir
+_KOBJS=${KOBJS:S,^,${KOBJDIR}/,g}
+
+${PROG}:${OBJS} ${_KOBJS} ${LIBS}
+	${LD} -N -T ${RELOC} -e start ${OBJS} ${_KOBJS} ${LIBS}
 	# convert to Sun magic
 	(echo -n 01 | tr 01 '\01\03'; tail +3c a.out) > ${.TARGET}
 	@rm a.out