diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64
index 9dd52f9b67c4..dd2430a1826f 100644
--- a/sys/conf/files.sparc64
+++ b/sys/conf/files.sparc64
@@ -15,7 +15,6 @@ crypto/des/des_enc.c		optional	crypto
 dev/auxio/auxio.c		optional	auxio sbus
 dev/auxio/auxio.c		optional	auxio ebus
 dev/esp/esp_sbus.c		optional	esp sbus
-dev/esp/lsi64854.c		optional	esp sbus
 dev/fb/creator.c		optional	creator sc
 dev/fb/fb.c			optional	sc
 dev/fb/splash.c			optional	splash
@@ -68,6 +67,7 @@ sparc64/pci/ofw_pcibus.c	optional	pci
 sparc64/pci/ofw_pci_if.m	standard
 sparc64/pci/psycho.c		optional	pci
 sparc64/sbus/sbus.c		optional	sbus
+sparc64/sbus/lsi64854.c         optional        esp sbus
 sparc64/sparc64/autoconf.c	standard
 sparc64/sparc64/bus_machdep.c	standard
 sparc64/sparc64/cache.c		standard
diff --git a/sys/modules/esp/Makefile b/sys/modules/esp/Makefile
index 2b747fdd6be7..3b36ce3fb779 100644
--- a/sys/modules/esp/Makefile
+++ b/sys/modules/esp/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../dev/esp
+.PATH: ${.CURDIR}/../../dev/esp ${.CURDIR}/../../sparc64/sbus
 
 KMOD=	esp
 
diff --git a/sys/sparc64/sbus/lsi64854.c b/sys/sparc64/sbus/lsi64854.c
index dca8526f7180..ed277eeb7d0c 100644
--- a/sys/sparc64/sbus/lsi64854.c
+++ b/sys/sparc64/sbus/lsi64854.c
@@ -80,8 +80,8 @@ __FBSDID("$FreeBSD$");
 #include <cam/cam_ccb.h>
 #include <cam/scsi/scsi_all.h>
 
-#include <dev/esp/lsi64854reg.h>
-#include <dev/esp/lsi64854var.h>
+#include <sparc64/sbus/lsi64854reg.h>
+#include <sparc64/sbus/lsi64854var.h>
 
 #include <dev/esp/ncr53c9xreg.h>
 #include <dev/esp/ncr53c9xvar.h>