diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index e76dc05263ee..365719da6c36 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -2,9 +2,9 @@
 
 # XXX present but broken: atapi ip_mroute_mod joy pcic
 
-SUBDIR=	ax al ccd cd9660 coda dm fdesc fxp if_disc if_ppp if_sl if_tun ipfw \
-	kernfs md mfs mii msdos mx nfs ntfs nullfs pn portal procfs rl sf \
-	sis sk ste ti tl umapfs union vn vr wb xl
+SUBDIR=	aha al ax ccd cd9660 coda dm fdesc fxp if_disc if_ppp if_sl if_tun \
+	ipfw kernfs md mfs mii msdos mx nfs ntfs nullfs pn portal procfs rl \
+	sf sis sk ste ti tl umapfs union vn vr wb xl
 
 # XXX some of these can move to the general case when de-i386'ed
 .if ${MACHINE_ARCH} == "i386"
diff --git a/sys/modules/aha/Makefile b/sys/modules/aha/Makefile
new file mode 100644
index 000000000000..e0d4f3f6016c
--- /dev/null
+++ b/sys/modules/aha/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+S	= ${.CURDIR}/../..
+.PATH:	$S/dev/aha
+KMOD	= aha
+SRCS	= aha.c aha_isa.c ahareg.h opt_cam.h device_if.h bus_if.h aha.h \
+	opt_scsi.h isa_if.h
+CLEANFILES	+= aha.h device_if.h bus_if.h opt_cam.h opt_scsi.h isa_if.h
+CFLAGS	+= ${DEBUG_FLAGS}
+
+aha.h:
+	echo "#define NAHA 1" > aha.h
+
+opt_cam.h:
+	touch opt_cam.h
+
+opt_scsi.h:
+	echo "#define SCSI_DELAY 15000" > opt_scsi.h
+
+device_if.h: $S/kern/makedevops.pl $S/kern/device_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/device_if.m
+
+bus_if.h: $S/kern/makedevops.pl $S/kern/bus_if.m
+	perl $S/kern/makedevops.pl -h $S/kern/bus_if.m
+
+isa_if.h: $S/kern/makedevops.pl $S/isa/isa_if.m
+	perl $S/kern/makedevops.pl -h $S/isa/isa_if.m
+
+.include <bsd.kmod.mk>