diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -22,7 +22,6 @@
 SRCS=	\
 	acpi.c			\
 	acpi_device.c		\
-	atkbdc.c		\
 	audio.c			\
 	basl.c			\
 	bhyvegc.c		\
@@ -67,9 +66,6 @@
 	pci_xhci.c		\
 	pctestdev.c		\
 	pm.c			\
-	post.c			\
-	ps2kbd.c		\
-	ps2mouse.c		\
 	qemu_fwcfg.c		\
 	qemu_loader.c		\
 	rfb.c			\
@@ -138,6 +134,4 @@
 
 NO_WCAST_ALIGN=
 
-SUBDIR=	kbdlayout
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bhyve/amd64/Makefile.inc b/usr.sbin/bhyve/amd64/Makefile.inc
--- a/usr.sbin/bhyve/amd64/Makefile.inc
+++ b/usr.sbin/bhyve/amd64/Makefile.inc
@@ -1,3 +1,9 @@
 SRCS+=	\
+	atkbdc.c	\
 	fwctl.c		\
+	post.c		\
+	ps2kbd.c	\
+	ps2mouse.c	\
 	task_switch.c
+
+SUBDIR+=	kbdlayout
diff --git a/usr.sbin/bhyve/atkbdc.h b/usr.sbin/bhyve/amd64/atkbdc.h
rename from usr.sbin/bhyve/atkbdc.h
rename to usr.sbin/bhyve/amd64/atkbdc.h
diff --git a/usr.sbin/bhyve/atkbdc.c b/usr.sbin/bhyve/amd64/atkbdc.c
rename from usr.sbin/bhyve/atkbdc.c
rename to usr.sbin/bhyve/amd64/atkbdc.c
diff --git a/usr.sbin/bhyve/post.c b/usr.sbin/bhyve/amd64/post.c
rename from usr.sbin/bhyve/post.c
rename to usr.sbin/bhyve/amd64/post.c
diff --git a/usr.sbin/bhyve/ps2kbd.h b/usr.sbin/bhyve/amd64/ps2kbd.h
rename from usr.sbin/bhyve/ps2kbd.h
rename to usr.sbin/bhyve/amd64/ps2kbd.h
diff --git a/usr.sbin/bhyve/ps2kbd.c b/usr.sbin/bhyve/amd64/ps2kbd.c
rename from usr.sbin/bhyve/ps2kbd.c
rename to usr.sbin/bhyve/amd64/ps2kbd.c
diff --git a/usr.sbin/bhyve/ps2mouse.h b/usr.sbin/bhyve/amd64/ps2mouse.h
rename from usr.sbin/bhyve/ps2mouse.h
rename to usr.sbin/bhyve/amd64/ps2mouse.h
diff --git a/usr.sbin/bhyve/ps2mouse.c b/usr.sbin/bhyve/amd64/ps2mouse.c
rename from usr.sbin/bhyve/ps2mouse.c
rename to usr.sbin/bhyve/amd64/ps2mouse.c
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -86,7 +86,9 @@
 
 #include "bhyverun.h"
 #include "acpi.h"
-#include "atkbdc.h"
+#ifdef __amd64__
+#include "amd64/atkbdc.h"
+#endif
 #include "bootrom.h"
 #include "config.h"
 #include "inout.h"
@@ -1453,7 +1455,9 @@
 	init_inout();
 	kernemu_dev_init();
 	init_bootrom(ctx);
+#ifdef __amd64__
 	atkbdc_init(ctx);
+#endif
 	pci_irq_init(ctx);
 	ioapic_init(ctx);
 
diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c
--- a/usr.sbin/bhyve/snapshot.c
+++ b/usr.sbin/bhyve/snapshot.c
@@ -77,7 +77,9 @@
 
 #include "bhyverun.h"
 #include "acpi.h"
-#include "atkbdc.h"
+#ifdef __amd64__
+#include "amd64/atkbdc.h"
+#endif
 #include "debug.h"
 #include "inout.h"
 #include "ipc.h"
@@ -137,7 +139,9 @@
  })
 
 static const struct vm_snapshot_dev_info snapshot_devs[] = {
+#ifdef __amd64__
 	{ "atkbdc",	atkbdc_snapshot,	NULL,		NULL		},
+#endif
 	{ "virtio-net",	pci_snapshot,		pci_pause,	pci_resume	},
 	{ "virtio-blk",	pci_snapshot,		pci_pause,	pci_resume	},
 	{ "virtio-rnd",	pci_snapshot,		NULL,		NULL		},