diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index b35421c5770..74a09b838ae 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
-# XXX present but broken: atapi ip_mroute_mod joy pcic
+# XXX present but broken: ip_mroute_mod pcic
 
 SUBDIR=	aha ccd cd9660 coda dc fdesc fxp if_disc if_ppp if_sl if_tun \
-	ipfilter ipfw kernfs md mfs mii msdos netgraph nfs ntfs nullfs \
+	ipfilter ipfw joy kernfs md mfs mii msdos netgraph nfs ntfs nullfs \
 	portal procfs rl sf sis sk ste ti tl \
 	ugen uhid ukbd ulpt umapfs umass umodem ums union usb vn vr wb xl
 
diff --git a/sys/modules/joy/Makefile b/sys/modules/joy/Makefile
index 3051bd7913d..a275add5d7b 100644
--- a/sys/modules/joy/Makefile
+++ b/sys/modules/joy/Makefile
@@ -1,12 +1,10 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../i386/isa
+.PATH:	${.CURDIR}/../../isa
 KMOD	= joy
-SRCS	= joy.c opt_devfs.h
+SRCS	= bus_if.h device_if.h isa_if.h joy.c
 MAN8	= joy.8
 
-CFLAGS		+= -DJOY_MODULE
-
 afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${.CURDIR}/joy.sh ${DESTDIR}/usr/bin/joy