diff --git a/sys/arch/atari/stand/bootxx/Makefile.bootxx b/sys/arch/atari/stand/bootxx/Makefile.bootxx
index e6a68708cbac..9f5deb3e73ab 100644
--- a/sys/arch/atari/stand/bootxx/Makefile.bootxx
+++ b/sys/arch/atari/stand/bootxx/Makefile.bootxx
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootxx,v 1.8 2009/01/06 13:35:30 tsutsui Exp $
+#	$NetBSD: Makefile.bootxx,v 1.9 2009/03/31 11:42:07 tsutsui Exp $
 
 NOMAN=	# defined
 
@@ -25,7 +25,8 @@ S_LIBTOS=${S}/arch/atari/stand/tostools/libtos
 
 S_MACHSAOBJ!=	cd ${S_MACHSA} && ${PRINTOBJDIR}
 
-LIBSA=${S_MACHSAOBJ}/libsa.a
+LIBSA=${S_MACHSAOBJ}/lib/sa/libsa.a
+LIBKERN=${S_MACHSAOBJ}/lib/kern/libkern.a
 
 .include "../../Makefile.booters"
 .include "../../xxboot/${BTYPE}_LOADADDR"
@@ -47,7 +48,7 @@ LINKFLAGS=	-static -N -Ttext ${LOADADDR}
 #
 SRCS=	start.S bootxx.c filesystem.c
 
-LIBS=	${LIBSA}
+LIBS=	${LIBSA} ${LIBKERN}
 
 beforeinstall:
 	${INSTALL_DIR} ${DESTDIR}${BINDIR}
diff --git a/sys/arch/atari/stand/bootxxx/Makefile.bootxxx b/sys/arch/atari/stand/bootxxx/Makefile.bootxxx
index 3907b093885f..59602ed6a8bf 100644
--- a/sys/arch/atari/stand/bootxxx/Makefile.bootxxx
+++ b/sys/arch/atari/stand/bootxxx/Makefile.bootxxx
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootxxx,v 1.5 2009/01/13 13:44:01 tsutsui Exp $
+#	$NetBSD: Makefile.bootxxx,v 1.6 2009/03/31 11:42:07 tsutsui Exp $
 
 NOMAN=	# defined
 
@@ -25,7 +25,8 @@ S_LIBTOS=${S}/arch/atari/stand/tostools/libtos
 
 S_MACHSAOBJ!=	cd ${S_MACHSA} && ${PRINTOBJDIR}
 
-LIBSA=${S_MACHSAOBJ}/libsa.a
+LIBSA=${S_MACHSAOBJ}/lib/sa/libsa.a
+LIBKERN=${S_MACHSAOBJ}/lib/kern/libkern.a
 
 .include "../../Makefile.booters"
 .include "../../xxboot/${BTYPE}_LOADADDR"
@@ -44,7 +45,7 @@ LINKFLAGS=	-static -N -Ttext ${LOADADDR3}
 #
 SRCS=	start.S bootxxx.c aout.c bsdstart.s elf.c filesystem.c sysinfo.c
 
-LIBS=	${LIBSA}
+LIBS=	${LIBSA} ${LIBKERN}
 
 beforeinstall:
 	${INSTALL_DIR} ${DESTDIR}${BINDIR}
diff --git a/sys/arch/atari/stand/libsa/Makefile b/sys/arch/atari/stand/libsa/Makefile
index a4d70b1003c5..7c948ee9cbca 100644
--- a/sys/arch/atari/stand/libsa/Makefile
+++ b/sys/arch/atari/stand/libsa/Makefile
@@ -1,60 +1,30 @@
-#	$NetBSD: Makefile,v 1.29 2009/03/19 10:19:33 tsutsui Exp $
-
-LIB=	sa
-
-NOPIC=		# defined
-NOPROFILE=	# defined
-NOLINT=		# defnied
-
-NO_NET=
+#	$NetBSD: Makefile,v 1.30 2009/03/31 11:42:07 tsutsui Exp $
 
 # Logically src/sys
-S=${.CURDIR}/../../../..
-S_SA=${S}/lib/libsa
-S_KERN=${S}/lib/libkern
-S_MACHSA=${S}/arch/atari/stand/libsa
-
-.include "${S}/../common/lib/libc/Makefile.inc"
+S!=	cd ${.CURDIR}/../../../..; pwd
 
 .include "../Makefile.booters"
 
-CPPFLAGS+=	-I. -I${S_MACHSA} -I${S_KERN} -I${S_SA} -I${S}
+CPPFLAGS+=	-I${S} -I.
 
-.PATH:  ${S_SA} ${S_KERN}
+.include <bsd.prog.mk>
 
-#
-# NetBSD/atari specific replacements: dev.c
-#
+### find out what to use for libsa
+SA_AS= library
+SAMISCMAKEFLAGS= SA_INCLUDE_NET=no SA_EXTRADIR=${.CURDIR}
+.include "${S}/lib/libsa/Makefile.inc"
+LIBSA= ${SALIB}
 
-# machine dependant routines
-SRCS=	consio.S diskio.c
+### find out what to use for libkern
+KERN_AS= library
+.include "${S}/lib/libkern/Makefile.inc"
+LIBKERN= ${KERNLIB}
 
-# from common/lib/libc
-SRCS+=	ashldi3.c ashrdi3.c bzero.c strcmp.c strlen.c
+LIBS=	${LIBSA} ${LIBKERN}
 
-# stand routines
-SRCS+=	alloc.c bcopy.c exec.c files.c getfile.c gets.c globals.c \
-	panic.c memcmp.c memcpy.c memmove.c memset.c printf.c strerror.c \
-	subr_prf.c twiddle.c
+realall: ${LIBS}
 
-# io routines
-SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c ioctl.c \
-	lseek.c open.c nullfs.c read.c stat.c fstat.c write.c
+cleandir distclean: cleanlibdir
 
-.if !defined(NO_NET)
-# network routines
-SRCS+=	arp.c ether.c in_cksum.c net.c netif.c rpc.c
-.endif
-
-# network info services:
-SRCS+=	bootp.c rarp.c bootparam.c
-
-# boot filesystems
-SRCS+=	ufs.c nfs.c
-
-# only needed during build
-libinstall::
-
-.include <bsd.own.mk>
-.undef DESTDIR
-.include <bsd.lib.mk>
+cleanlibdir:
+	-rm -rf lib
diff --git a/sys/arch/atari/stand/libsa/Makefile.inc b/sys/arch/atari/stand/libsa/Makefile.inc
new file mode 100644
index 000000000000..67f70f777822
--- /dev/null
+++ b/sys/arch/atari/stand/libsa/Makefile.inc
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.inc,v 1.1 2009/03/31 11:42:07 tsutsui Exp $
+
+.PATH.c: ${SA_EXTRADIR}
+.PATH.S: ${SA_EXTRADIR}
+
+# NetBSD/atari specific replacements: dev.c
+
+# machine dependant routines
+SRCS+=   consio.S dev.c diskio.c