diff --git a/sys/conf/files b/sys/conf/files
index 24f760696d0..3bc21f3b952 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -338,6 +338,7 @@ dev/acpica/acpi_pci_link.c	optional acpi pci
 dev/acpica/acpi_pcib.c		optional acpi pci
 dev/acpica/acpi_pcib_acpi.c	optional acpi pci
 dev/acpica/acpi_pcib_pci.c	optional acpi pci
+dev/acpica/acpi_perf.c		optional acpi_perf acpi
 dev/acpica/acpi_powerres.c	optional acpi
 dev/acpica/acpi_quirk.c		optional acpi
 dev/acpica/acpi_resource.c	optional acpi
@@ -423,6 +424,7 @@ dev/cardbus/cardbus_cis.c	optional cardbus
 dev/ciss/ciss.c			optional ciss
 dev/cm/smc90cx6.c		optional cm
 dev/cnw/if_cnw.c		optional cnw pccard
+dev/cpufreq/ichss.c		optional ichss
 dev/cs/if_cs.c			optional cs
 dev/cs/if_cs_isa.c		optional cs isa
 dev/cs/if_cs_pccard.c		optional cs pccard
@@ -1076,6 +1078,7 @@ isofs/cd9660/cd9660_vnops.c	optional cd9660
 isofs/cd9660/cd9660_iconv.c	optional cd9660_iconv
 kern/bus_if.m			standard
 kern/clock_if.m			optional genclock
+kern/cpufreq_if.m		standard
 kern/device_if.m		standard
 kern/imgact_elf.c		standard
 kern/imgact_shell.c		standard
@@ -1088,6 +1091,7 @@ kern/kern_alq.c			optional alq
 kern/kern_clock.c		standard
 kern/kern_condvar.c		standard
 kern/kern_conf.c		standard
+kern/kern_cpu.c			standard
 kern/kern_context.c		standard
 kern/kern_descrip.c		standard
 kern/kern_environment.c		standard
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 1b36bcbae97..ecb72015872 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -302,7 +302,8 @@ MFILES?= dev/acpica/acpi_if.m dev/eisa/eisa_if.m dev/iicbus/iicbb_if.m \
 	dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \
 	dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \
 	dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m dev/uart/uart_if.m \
-	dev/usb/usb_if.m isa/isa_if.m kern/bus_if.m kern/device_if.m \
+	dev/usb/usb_if.m isa/isa_if.m \
+	kern/bus_if.m kern/cpufreq_if.m kern/device_if.m \
 	libkern/iconv_converter_if.m opencrypto/crypto_if.m \
 	pc98/pc98/canbus_if.m pci/agp_if.m
 
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 4d1b79eb1df..87af80f1fb2 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -49,6 +49,7 @@ SUBDIR=	${_3dfx} \
 	coda5 \
 	${_coff} \
 	${_cp} \
+	cpufreq \
 	${_crypto} \
 	${_cryptodev} \
 	${_cs} \
diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile
index 6339695e5c6..26d1aede7e3 100644
--- a/sys/modules/acpi/Makefile
+++ b/sys/modules/acpi/Makefile
@@ -8,6 +8,7 @@
 .error "The ACPI module is only for i386"
 .endif
 
-SUBDIR= acpi acpi_asus acpi_ibm acpi_panasonic acpi_sony acpi_toshiba acpi_video 
+SUBDIR= acpi acpi_asus acpi_ibm acpi_panasonic acpi_perf acpi_sony \
+	acpi_toshiba acpi_video
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/acpi/acpi_perf/Makefile b/sys/modules/acpi/acpi_perf/Makefile
new file mode 100644
index 00000000000..bb2e2c00000
--- /dev/null
+++ b/sys/modules/acpi/acpi_perf/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+.PATH:		${.CURDIR}/../../../dev/acpica
+CFLAGS+=	-I${.CURDIR}/../../../contrib/dev/acpica
+
+KMOD=		acpi_perf
+WARNS?=		2
+SRCS=		acpi_perf.c
+SRCS+=		acpi_if.h bus_if.h cpufreq_if.h device_if.h opt_acpi.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/cpufreq/Makefile b/sys/modules/cpufreq/Makefile
new file mode 100644
index 00000000000..cd31b14731e
--- /dev/null
+++ b/sys/modules/cpufreq/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../dev/cpufreq
+
+KMOD=	cpufreq
+WARNS?=	2
+SRCS=	ichss.c
+SRCS+=	bus_if.h cpufreq_if.h device_if.h pci_if.h
+
+.include <bsd.kmod.mk>