diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 8a439cc7b39..fc7696827d3 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -201,6 +201,7 @@ dev/ed/if_ed_isa.c		optional ed isa
 dev/ed/if_ed_wd80x3.c		optional ed isa
 dev/ed/if_ed_hpp.c		optional ed isa ed_hpp
 dev/ed/if_ed_sic.c		optional ed isa ed_sic
+dev/ep/elink.c			optional ep
 dev/fb/fb.c			optional fb | vga
 dev/fb/s3_pci.c			optional s3pci
 dev/fb/vesa.c			optional vga vesa
@@ -519,7 +520,6 @@ i386/ibcs2/ibcs2_util.c		optional ibcs2
 i386/ibcs2/ibcs2_xenix.c	optional ibcs2
 i386/ibcs2/ibcs2_xenix_sysent.c	optional ibcs2
 i386/ibcs2/imgact_coff.c	optional ibcs2
-i386/isa/elink.c		optional ep
 i386/isa/pmtimer.c		optional pmtimer
 i386/isa/prof_machdep.c		optional profiling-routine
 i386/linux/imgact_linux.c	optional compat_linux
diff --git a/sys/i386/isa/elink.c b/sys/dev/ep/elink.c
similarity index 99%
rename from sys/i386/isa/elink.c
rename to sys/dev/ep/elink.c
index 852134d6c46..b233b7ade8a 100644
--- a/sys/i386/isa/elink.c
+++ b/sys/dev/ep/elink.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/cpufunc.h>
 
-#include <i386/isa/elink.h>
+#include <dev/ep/elink.h>
 
 /*
  * Issue a `global reset' to all cards, and reset the ID state machines.  We
diff --git a/sys/i386/isa/elink.h b/sys/dev/ep/elink.h
similarity index 100%
rename from sys/i386/isa/elink.h
rename to sys/dev/ep/elink.h
diff --git a/sys/dev/ep/if_ep_isa.c b/sys/dev/ep/if_ep_isa.c
index 6e858edf85f..32ed8e2db88 100644
--- a/sys/dev/ep/if_ep_isa.c
+++ b/sys/dev/ep/if_ep_isa.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ep/if_epvar.h>
 
 #ifdef __i386__
-#include <i386/isa/elink.h>
+#include <dev/ep/elink.h>
 #endif
 
 #ifdef __i386__
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index b3d23a958db..25e08ff93e4 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -115,7 +115,6 @@ SUBDIR=	\
 	dummynet \
 	${_ed} \
 	${_efirt} \
-	${_elink} \
 	${_em} \
 	${_ena} \
 	${_ep} \
@@ -742,7 +741,6 @@ _coff=		coff
 .if ${MK_SOURCELESS_UCODE} != "no"
 _cp=		cp
 .endif
-_elink=		elink
 _glxiic=	glxiic
 _glxsb=		glxsb
 #_ibcs2=		ibcs2
diff --git a/sys/modules/elink/Makefile b/sys/modules/elink/Makefile
deleted file mode 100644
index 78ccd947940..00000000000
--- a/sys/modules/elink/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-#
-
-.PATH:	${SRCTOP}/sys/i386/isa
-
-KMOD=		elink
-SRCS=		elink.c
-EXPORT_SYMS=	elink_reset elink_idseq
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/ep/Makefile b/sys/modules/ep/Makefile
index c91c38784f4..78d0173c21a 100644
--- a/sys/modules/ep/Makefile
+++ b/sys/modules/ep/Makefile
@@ -7,6 +7,9 @@ SYSDIR?=${SRCTOP}/sys
 
 KMOD=	if_ep
 SRCS=	if_ep.c
+.if ${MACHINE_CPUARCH} == "i386"
+SRCS+=	elink.c
+.endif
 SRCS+=	if_ep_pccard.c pccarddevs.h card_if.h
 SRCS+=	if_ep_isa.c isa_if.h
 SRCS+=	bus_if.h device_if.h