diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 7b75de6070e2..03ced32973ea 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -185,6 +185,7 @@ i386/i386/db_interface.c	optional	ddb
 i386/i386/db_trace.c		optional	ddb
 i386/i386/dump_machdep.c	standard
 i386/i386/elan-mmcr.c		optional	cpu_elan
+i386/i386/elan-mmcr.c		optional	cpu_soekris
 i386/i386/elf_machdep.c		standard
 i386/i386/exception.s		standard
 i386/i386/geode.c		optional	cpu_geode
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 702d3afaa68c..91f22d6e7ac1 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -47,6 +47,7 @@ CPU_CYRIX_NO_LOCK		opt_cpu.h
 CPU_DIRECT_MAPPED_CACHE		opt_cpu.h
 CPU_DISABLE_5X86_LSSER		opt_cpu.h
 CPU_ELAN			opt_cpu.h
+CPU_SOEKRIS			opt_cpu.h
 CPU_FASTER_5X86_FPU		opt_cpu.h
 CPU_GEODE			opt_cpu.h
 CPU_I486_ON_386			opt_cpu.h
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 7a335623fefe..0ce2ef203dc3 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -93,6 +93,9 @@ cpu		I686_CPU		# aka Pentium Pro(tm)
 #    ELAN_XTAL sets the clock crystal frequency in Hz
 #    ELAN_PPS enables precision timestamp code.
 #
+# CPU_SOEKRIS enables support www.soekris.com hardware.
+#    For the 45xx series you can also use ELAN_XTAL and ELAN_PPS options.
+#
 # CPU_ENABLE_SSE enables SSE/MMX2 instructions support.  This is default
 # on I686_CPU and above.
 # CPU_DISABLE_SSE explicitly prevent I686_CPU from turning on SSE.
@@ -167,6 +170,7 @@ options 	CPU_BTB_EN
 options 	CPU_DIRECT_MAPPED_CACHE
 options 	CPU_DISABLE_5X86_LSSER
 options 	CPU_ELAN
+options 	CPU_SOEKRIS
 options 	ELAN_XTAL=32768000
 options 	ELAN_PPS
 options 	CPU_ENABLE_SSE