diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 30dedced881..fbcb482bff2 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -119,7 +119,6 @@ dev/sbni/if_sbni_isa.c		optional sbni isa
 dev/sbni/if_sbni_pci.c		optional sbni pci
 dev/speaker/spkr.c		optional speaker
 dev/superio/superio.c		optional superio isa
-dev/syscons/apm/apm_saver.c	optional apm_saver apm
 dev/syscons/scvesactl.c		optional sc vga vesa
 dev/syscons/scvgarndr.c		optional sc vga
 dev/tpm/tpm.c			optional tpm
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index a34b48c1846..0d921872507 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -275,7 +275,6 @@ device		nvram		# Access to rtc cmos via /dev/nvram
 device		speaker		#Play IBM BASIC-style noises out your speaker
 envvar		hint.speaker.0.at="isa"
 envvar		hint.speaker.0.port="0x61"
-device		apm_saver	# Requires APM
 
 
 #####################################################################
diff --git a/sys/modules/syscons/Makefile b/sys/modules/syscons/Makefile
index 256cfe3ac74..746c1968676 100644
--- a/sys/modules/syscons/Makefile
+++ b/sys/modules/syscons/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=	${_apm} \
-	beastie \
+SUBDIR= beastie \
 	blank \
 	daemon \
 	dragon \
@@ -15,8 +14,4 @@ SUBDIR=	${_apm} \
 	star \
 	warp
 
-.if ${MACHINE_CPUARCH} == "i386"
-_apm=		apm
-.endif
-
 .include <bsd.subdir.mk>
diff --git a/sys/modules/syscons/apm/Makefile b/sys/modules/syscons/apm/Makefile
deleted file mode 100644
index 9214d2d90a0..00000000000
--- a/sys/modules/syscons/apm/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${SRCTOP}/sys/dev/syscons/apm
-
-KMOD=	apm_saver
-SRCS= 	apm_saver.c
-
-.include <bsd.kmod.mk>