diff --git a/sys/Makefile b/sys/Makefile
index 7245dc05ae80..e13a51a785cf 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,19 +1,15 @@
-#	$Id: Makefile,v 1.13 1998/10/11 18:39:38 rnordier Exp $
+#	$Id: Makefile,v 1.14 1998/11/03 06:50:58 peter Exp $
 
-# This is the old aout only boot loader.
-.if	exists(${MACHINE}/boot) && ${OBJFORMAT} == "aout"
-SUBDIR=	${MACHINE}/boot
-.elif	exists(boot) && ${MACHINE} == "i386" && ${OBJFORMAT} == "elf"
-SUBDIR=	boot
+SUBDIR=	modules
+
+.if ${MACHINE_ARCH} == "alpha" || ${OBJFORMAT} == "elf"
+SUBDIR+=boot
 .endif
 
-.if	exists(boot) && ${MACHINE_ARCH} == "alpha"
-SUBDIR= boot
+.if exists(${.CURDIR}/${MACHINE}/boot)
+SUBDIR+=${MACHINE}/boot
 .endif
 
-# KLD modules build for both a.out and ELF
-SUBDIR+=modules
-
 HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh`
 
 .include <bsd.subdir.mk>