diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 80eb5c22dc8f..da82a4e29bbe 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -188,6 +188,7 @@ SUBDIR+=3dfx \
 	scsi_low \
 	smbfs \
 	sound \
+	speaker \
 	splash \
 	sppp \
 	sr \
@@ -201,7 +202,6 @@ SUBDIR+=3dfx \
 SUBDIR+=aac \
 	acpi \
 	asr \
-	atspeaker \
 	cardbus \
 	cbb \
 	ciss \
@@ -217,7 +217,6 @@ SUBDIR+=aac \
 .elif ${MACHINE} == "pc98"
 SUBDIR+=canbepm \
 	canbus \
-	pcspeaker \
 	pmc \
 	snc
 .endif
diff --git a/sys/modules/pcspeaker/Makefile b/sys/modules/pcspeaker/Makefile
deleted file mode 100644
index ff0f64f7a8da..000000000000
--- a/sys/modules/pcspeaker/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../pc98/pc98
-
-KMOD=	pcspeaker
-SRCS=	spkr.c
-SRCS+=	bus_if.h device_if.h isa_if.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/atspeaker/Makefile b/sys/modules/speaker/Makefile
similarity index 100%
rename from sys/modules/atspeaker/Makefile
rename to sys/modules/speaker/Makefile