diff --git a/sys/conf/files b/sys/conf/files
index 64112ea09e10..8b7c19205f9d 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2828,8 +2828,3 @@ dev/xen/netfront/netfront.c	optional xen | xenhvm
 dev/xen/xenpci/xenpci.c		optional xenpci
 dev/xen/xenpci/evtchn.c         optional xenpci
 dev/xen/xenpci/machine_reboot.c optional xenpci
-dev/x86bios/x86bios.c		optional x86bios | atkbd | dpms | vesa
-dev/x86bios/x86bios_alloc.c	optional x86bios | atkbd | dpms | vesa
-contrib/x86emu/x86emu.c		optional x86bios | atkbd | dpms | vesa
-contrib/x86emu/x86emu_util.c	optional x86bios | atkbd | dpms | vesa
-
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index ae2d42b39275..244a9b784c7f 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -294,3 +294,11 @@ i386/cpufreq/p4tcc.c		optional	cpufreq
 #
 libkern/memmove.c		standard
 libkern/memset.c		standard
+#
+# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa
+#
+dev/x86bios/x86bios.c		optional x86bios | atkbd | dpms | vesa
+dev/x86bios/x86bios_alloc.c	optional x86bios | atkbd | dpms | vesa
+contrib/x86emu/x86emu.c		optional x86bios | atkbd | dpms | vesa
+contrib/x86emu/x86emu_util.c	optional x86bios | atkbd | dpms | vesa
+
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index df4cfa153182..b332f31ec0d2 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -378,3 +378,10 @@ i386/xbox/xbox.c		optional xbox
 i386/xbox/xboxfb.c		optional xboxfb
 dev/fb/boot_font.c		optional xboxfb
 i386/xbox/pic16l.s		optional xbox
+#
+# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa
+#
+dev/x86bios/x86bios.c		optional x86bios | atkbd | dpms | vesa
+dev/x86bios/x86bios_alloc.c	optional x86bios | atkbd | dpms | vesa
+contrib/x86emu/x86emu.c		optional x86bios | atkbd | dpms | vesa
+contrib/x86emu/x86emu_util.c	optional x86bios | atkbd | dpms | vesa