diff --git a/sys/Makefile b/sys/Makefile
index a814e0f42f3..8c3c813f2e5 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,7 +1,9 @@
 # $FreeBSD$
 
 # The boot loader
+.if ${MACHINE_ARCH} != "arm"
 SUBDIR=	boot
+.endif
 
 # Loadable kernel modules
 .if defined(MODULES_WITH_WORLD)
diff --git a/sys/boot/Makefile b/sys/boot/Makefile
index 9c5dc055788..aa2c19c3d24 100644
--- a/sys/boot/Makefile
+++ b/sys/boot/Makefile
@@ -11,9 +11,7 @@ SUBDIR+=		ofw
 .endif
 
 # Pick the machine-dependent subdir based on the target architecture.
-.if ${MACHINE_ARCH} != "arm"
 SUBDIR+=		${MACHINE:S/amd64/i386/}
-.endif
 
 # Build ARC / AlphaBIOS executable on the Alpha
 # (this is a WIP (work in progress)).