diff --git a/mk/qemu.mk b/mk/qemu.mk
index 31f917f..78c6bf5 100644
--- a/mk/qemu.mk
+++ b/mk/qemu.mk
@@ -21,6 +21,9 @@ else ifeq ($(ARCH),x86_64)
 	ifeq ($(efi),yes)
 		FIRMWARE=/usr/share/OVMF/OVMF_CODE.fd
 	endif
+	ifneq ($(usb),no)
+		QEMUFLAGS+=-device nec-usb-xhci,id=xhci
+	endif
 else ifeq ($(ARCH),aarch64)
 	# Default to UEFI as U-Boot doesn't set up a framebuffer for us and we don't yet support
 	# setting up a framebuffer ourself.
@@ -41,7 +44,7 @@ else ifeq ($(ARCH),aarch64)
 		QEMUFLAGS+=-device ramfb
 	endif
 	ifneq ($(usb),no)
-		QEMUFLAGS+=-device usb-ehci -device usb-kbd -device usb-mouse
+		QEMUFLAGS+=-device qemu-xhci -device usb-kbd -device usb-mouse
 	endif
 else
 $(error Unsupported ARCH for QEMU "$(ARCH)"))
@@ -119,10 +122,6 @@ else ifeq ($(vga),virtio)
 	QEMUFLAGS+=-vga virtio
 endif
 
-ifneq ($(usb),no)
-	QEMUFLAGS+=-device nec-usb-xhci,id=xhci
-endif
-
 ifeq ($(gdb),yes)
 	QEMUFLAGS+=-d cpu_reset -s -S
 endif