diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 6c9a2b306811..2a62bb834b72 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -69,7 +69,6 @@ options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
 options 	SMP			# Symmetric MultiProcessor Kernel
 device		apic			# I/O APIC
 
-device		acpi
 device		isa
 device		eisa
 device		pci
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index d0b7cbc9fcc1..7f9b0c00b87d 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -234,6 +234,7 @@ SUBDIR+=3dfx \
 
 .if ${MACHINE} == "i386"
 SUBDIR+=aac \
+	acpi \
 	asr \
 	bios \
 	cardbus \