diff --git a/sys/modules/esp/Makefile b/sys/modules/esp/Makefile
index 2685b09ed298..2171d8556223 100644
--- a/sys/modules/esp/Makefile
+++ b/sys/modules/esp/Makefile
@@ -1,15 +1,13 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../dev/esp ${.CURDIR}/../../sparc64/sbus
+.PATH: ${.CURDIR}/../../dev/esp
 
 KMOD=	esp
+SRCS=	device_if.h ${esp_sbus} bus_if.h ncr53c9x.c ${ofw_bus_if} opt_cam.h
 
-SRCS=	ncr53c9x.c
-SRCS+=	opt_ddb.h opt_cam.h
-SRCS+=	device_if.h bus_if.h
-
-.if ${MACHINE_ARCH} == "sparc64"
-SRCS+=	esp_sbus.c ofw_bus_if.h
+.if ${MACHINE} == "sparc64"
+ofw_bus_if=	ofw_bus_if.h
+esp_sbus=	esp_sbus.c
 .endif
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hfa/Makefile b/sys/modules/hfa/Makefile
index 964083090442..5e0262364fbb 100644
--- a/sys/modules/hfa/Makefile
+++ b/sys/modules/hfa/Makefile
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
-SUBDIR=	hfa pci
+SUBDIR=	${eisa} hfa pci ${sbus}
 
 .ifdef notyet
 .if ${MACHINE_ARCH} == "i386"
-SUBDIR+=eisa
+eisa=	eisa
 .endif
 
-.if ${MACHINE_ARCH} == "sparc64"
-SUBDIR+=sbus
+.if ${MACHINE} == "sparc64"
+sbus=	sbus
 .endif
 .endif
 
diff --git a/sys/modules/hme/Makefile b/sys/modules/hme/Makefile
index 8f403710ce13..465628195eed 100644
--- a/sys/modules/hme/Makefile
+++ b/sys/modules/hme/Makefile
@@ -3,10 +3,12 @@
 .PATH: ${.CURDIR}/../../dev/hme
 
 KMOD=	if_hme
-SRCS=	bus_if.h device_if.h if_hme.c if_hme_pci.c miibus_if.h pci_if.h
+SRCS=	bus_if.h device_if.h if_hme.c if_hme_pci.c ${if_hme_sbus} miibus_if.h
+SRCS+=	${ofw_bus_if} pci_if.h
 
-.if ${MACHINE_ARCH} == "sparc64"
-SRCS+=	if_hme_sbus.c ofw_bus_if.h
+.if ${MACHINE} == "sparc64"
+if_hme_sbus=	if_hme_sbus.c
+ofw_bus_if=	ofw_bus_if.h
 .endif
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/isp/Makefile b/sys/modules/isp/Makefile
index fbdf1b4c2cc5..1caeef6d21a2 100644
--- a/sys/modules/isp/Makefile
+++ b/sys/modules/isp/Makefile
@@ -7,7 +7,7 @@ SRCS=	bus_if.h device_if.h pci_if.h \
 	opt_cam.h opt_ddb.h opt_isp.h \
 	isp.c isp_library.c isp_target.c isp_freebsd.c isp_pci.c
 
-.if ${MACHINE_ARCH} == sparc64
+.if ${MACHINE} == sparc64
 SRCS+=	isp_sbus.c ofw_bus_if.h
 .endif
 
diff --git a/sys/modules/ispfw/Makefile b/sys/modules/ispfw/Makefile
index 62bbb2e6bc1d..5d6263c7f814 100644
--- a/sys/modules/ispfw/Makefile
+++ b/sys/modules/ispfw/Makefile
@@ -39,7 +39,7 @@ SUBDIR += isp_2200
 SUBDIR += isp_2300
 SUBDIR += isp_2322
 SUBDIR += isp_2400
-.if ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE} == "sparc64"
 SUBDIR += isp_1000
 .endif
 
diff --git a/sys/modules/le/Makefile b/sys/modules/le/Makefile
index d3101e175152..dd202fb89553 100644
--- a/sys/modules/le/Makefile
+++ b/sys/modules/le/Makefile
@@ -16,7 +16,7 @@ if_le_isa=	if_le_isa.c
 isa_if=		isa_if.h
 .endif
 
-.if ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE} == "sparc64"
 if_le_lebuffer=	if_le_lebuffer.c
 if_le_ledma=	if_le_ledma.c
 lebuffer_sbus=	lebuffer_sbus.c
diff --git a/sys/modules/scc/Makefile b/sys/modules/scc/Makefile
index fe38cde8b89a..c1678b76f72f 100644
--- a/sys/modules/scc/Makefile
+++ b/sys/modules/scc/Makefile
@@ -2,7 +2,7 @@
 
 .PATH: ${.CURDIR}/../../dev/scc
 
-.if ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE} == "sparc64"
 scc_bfe= scc_bfe_ebus.c scc_bfe_sbus.c
 .endif
 .if ${MACHINE_ARCH} == "powerpc"
diff --git a/sys/modules/sound/driver/Makefile b/sys/modules/sound/driver/Makefile
index 711f7a81aa1f..3bff2fff9766 100644
--- a/sys/modules/sound/driver/Makefile
+++ b/sys/modules/sound/driver/Makefile
@@ -1,12 +1,15 @@
 # $FreeBSD$
 
 .if ${MACHINE_ARCH} == "sparc64"
-SUBDIR  = audiocs es137x
+.if ${MACHINE} == "sparc64"
+audiocs=	audiocs
+.endif
+SUBDIR=	${audiocs} es137x
 .else
-SUBDIR  = ad1816 als4000 atiixp cmi cs4281 csa ds1 emu10k1 emu10kx envy24
-SUBDIR += envy24ht es137x ess fm801 hda ich maestro maestro3 mss neomagic
-SUBDIR += sb16 sb8 sbc solo spicds t4dwave via8233 via82c686 vibes
-SUBDIR += driver uaudio
+SUBDIR=	ad1816 als4000 atiixp cmi cs4281 csa ds1 emu10k1 emu10kx envy24
+SUBDIR=	envy24ht es137x ess fm801 hda ich maestro maestro3 mss neomagic
+SUBDIR=	sb16 sb8 sbc solo spicds t4dwave via8233 via82c686 vibes
+SUBDIR=	driver uaudio
 .endif
 
 .include <bsd.subdir.mk>