diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -324,7 +324,9 @@
 device		ehci			# EHCI PCI->USB interface (USB 2.0)
 device		xhci			# XHCI PCI->USB interface (USB 3.0)
 device		usb			# USB Bus (required)
-device		ukbd			# Keyboard
+device		usbhid			# USB HID Transport
+device		hkbd			# HID Keyboard
+device		ukbd			# USB Keyboard
 device		umass			# Disks/Mass storage - Requires scbus and da
 
 # Sound support
@@ -375,6 +377,7 @@
 # HID support
 options 	HID_DEBUG		# enable debug msgs
 device		hid			# Generic HID support
+device		hidbus			# Generic HID Bus
 options 	IICHID_SAMPLING		# Workaround missing GPIO INTR support
 
 # EFI devices
diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC
--- a/sys/arm/conf/GENERIC
+++ b/sys/arm/conf/GENERIC
@@ -191,7 +191,9 @@
 
 device		axe			# USB-Ethernet
 device		umass			# Disks/Mass storage - Requires scbus and da
+device		usbhid			# USB HID Transport
 device		uhid			# "Human Interface Devices"
+device		hkbd			# Allow keyboard like HIDs to control console
 device		ukbd			# Allow keyboard like HIDs to control console
 
 # Device mode support
@@ -225,6 +227,7 @@
 # Framebuffer support
 device		vt
 device		kbdmux
+device		hms
 device		ums
 device		videomode
 device		vchiq
@@ -262,6 +265,7 @@
 
 # HID support
 device		hid		# Generic HID support
+device		hidbus		# Generic HID Bus
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -57,6 +57,7 @@
 # Comment following lines for boot console on serial port
 device		vt
 device		kbdmux
+device		hkbd
 device		ukbd
 
 device		sdhci
diff --git a/sys/arm/conf/TEGRA124 b/sys/arm/conf/TEGRA124
--- a/sys/arm/conf/TEGRA124
+++ b/sys/arm/conf/TEGRA124
@@ -85,6 +85,7 @@
 device		xhci			# XHCI USB interface
 device		tegra124_xusb_fw	# Tegra XUSB firmware
 device		usb			# USB Bus (required)
+device		usbhid			# USB HID Transport
 device		umass			# Disks/Mass storage - Requires scbus and da
 device		uhid			# "Human Interface Devices"
 #device		u3g			# USB modems
@@ -129,6 +130,9 @@
 
 # HID support
 device		hid			# Generic HID support
+device		hidbus			# Generic HID Bus
+device		hkbd			# Allow keyboard like HIDs to control console
+device		hms			# HID mouse
 
 # Flattened Device Tree
 options 	FDT			# Configure using FDT/DTB data
diff --git a/sys/arm64/conf/std.dev b/sys/arm64/conf/std.dev
--- a/sys/arm64/conf/std.dev
+++ b/sys/arm64/conf/std.dev
@@ -99,7 +99,9 @@
 device		ehci			# EHCI USB interface (USB 2.0)
 device		xhci			# XHCI USB interface (USB 3.0)
 device		usb			# USB Bus (required)
-device		ukbd			# Keyboard
+device		usbhid			# USB HID Transport
+device		hkbd			# HID Keyboard
+device		ukbd			# USB Keyboard
 device		umass			# Disks/Mass storage - Requires scbus and da
 
 # Sound support
@@ -112,6 +114,7 @@
 # HID support
 options 	HID_DEBUG		# enable debug msgs
 device		hid			# Generic HID support
+device		hidbus			# Generic HID Bus
 
 # Firmware
 device		mmio_sram		# Generic on-chip SRAM
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -289,7 +289,9 @@
 device		ehci			# EHCI PCI->USB interface (USB 2.0)
 device		xhci			# XHCI PCI->USB interface (USB 3.0)
 device		usb			# USB Bus (required)
-device		ukbd			# Keyboard
+device		usbhid			# USB HID Transport
+device		hkbd			# HID Keyboard
+device		ukbd			# USB Keyboard
 device		umass			# Disks/Mass storage - Requires scbus and da
 
 # Sound support
@@ -336,4 +338,5 @@
 # HID support
 options 	HID_DEBUG		# enable debug msgs
 device		hid			# Generic HID support
+device		hidbus			# Generic HID Bus
 options 	IICHID_SAMPLING		# Workaround missing GPIO INTR support
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -174,12 +174,15 @@
 device		ohci		# OHCI PCI->USB interface
 device		ehci		# EHCI PCI->USB interface
 device		usb		# USB Bus (required)
+device		usbhid		# USB HID Transport
 device		uhid		# "Human Interface Devices"
-device		ukbd		# Keyboard
+device		hkbd		# HID Keyboard
+device		ukbd		# USB Keyboard
 options 	KBD_INSTALL_CDEV # install a CDEV entry in /dev
 device		ulpt		# Printer
 device		umass		# Disks/Mass storage - Requires scbus and da0
-device		ums		# Mouse
+device		hms		# HID Mouse
+device		ums		# USB Mouse
 device		atp		# Apple USB touchpad
 device		urio		# Diamond Rio 500 MP3 player
 # USB Ethernet
@@ -235,3 +238,4 @@
 # HID support
 options 	HID_DEBUG		# enable debug msgs
 device		hid			# Generic HID support
+device		hidbus			# Generic HID Bus
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -213,11 +213,14 @@
 device		ehci		# EHCI PCI->USB interface
 device		xhci		# XHCI PCI->USB interface
 device		usb		# USB Bus (required)
+device		usbhid		# USB HID Transport
 device		uhid		# "Human Interface Devices"
-device		ukbd		# Keyboard
+device		hkbd		# HID Keyboard
+device		ukbd		# USB Keyboard
 options 	KBD_INSTALL_CDEV # install a CDEV entry in /dev
 device		umass		# Disks/Mass storage - Requires scbus and da0
-device		ums		# Mouse
+device		hms		# HID Mouse
+device		ums		# USB Mouse
 # USB Ethernet
 device		aue		# ADMtek USB Ethernet
 device		axe		# ASIX Electronics USB Ethernet
@@ -287,3 +290,4 @@
 # HID support
 options 	HID_DEBUG		# enable debug msgs
 device		hid			# Generic HID support
+device		hidbus			# Generic HID Bus
diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE
--- a/sys/powerpc/conf/GENERIC64LE
+++ b/sys/powerpc/conf/GENERIC64LE
@@ -209,11 +209,14 @@
 device		ehci		# EHCI PCI->USB interface
 device		xhci		# XHCI PCI->USB interface
 device		usb		# USB Bus (required)
+device		usbhid		# USB HID Transport
 device		uhid		# "Human Interface Devices"
-device		ukbd		# Keyboard
+device		hkbd		# HID Keyboard
+device		ukbd		# USB Keyboard
 options 	KBD_INSTALL_CDEV # install a CDEV entry in /dev
 device		umass		# Disks/Mass storage - Requires scbus and da0
-device		ums		# Mouse
+device		hms		# HID Mouse
+device		ums		# USB Mouse
 # USB Ethernet
 device		aue		# ADMtek USB Ethernet
 device		axe		# ASIX Electronics USB Ethernet
@@ -268,3 +271,4 @@
 # HID support
 options 	HID_DEBUG		# enable debug msgs
 device		hid			# Generic HID support
+device		hidbus			# Generic HID Bus
diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX
--- a/sys/powerpc/conf/MPC85XX
+++ b/sys/powerpc/conf/MPC85XX
@@ -109,10 +109,13 @@
 options 	USB_DEBUG	# enable debug msgs
 #device		uhci
 device		ehci
+device  	hkbd
 device  	ukbd
+device  	hms
 device  	ums
 device		umass
 device		usb
+device		usbhid
 device		vlan
 
 # P1022 DIU
@@ -124,3 +127,4 @@
 # HID support
 options 	HID_DEBUG	# enable debug msgs
 device		hid		# Generic HID support
+device		hidbus		# Generic HID bus
diff --git a/sys/powerpc/conf/MPC85XXSPE b/sys/powerpc/conf/MPC85XXSPE
--- a/sys/powerpc/conf/MPC85XXSPE
+++ b/sys/powerpc/conf/MPC85XXSPE
@@ -116,10 +116,13 @@
 options 	USB_DEBUG	# enable debug msgs
 #device		uhci
 device		ehci
+device  	hkbd
 device  	ukbd
+device  	hms
 device  	ums
 device		umass
 device		usb
+device		usbhid
 device		vlan
 
 # VirtIO support
@@ -139,3 +142,4 @@
 # HID support
 options 	HID_DEBUG	# enable debug msgs
 device		hid		# Generic HID support
+device		hidbus		# Generic HID bus
diff --git a/sys/powerpc/conf/QORIQ64 b/sys/powerpc/conf/QORIQ64
--- a/sys/powerpc/conf/QORIQ64
+++ b/sys/powerpc/conf/QORIQ64
@@ -112,15 +112,19 @@
 device		ehci
 device		umass
 device		usb
+device		usbhid
 device		vlan
 
 # Desktop related
 device  	vt
 device  	fbd
 options 	KBD_INSTALL_CDEV
+device  	hkbd
 device  	ukbd
+device  	hms
 device  	ums
 
 # HID support
 options 	HID_DEBUG	# enable debug msgs
 device		hid		# Generic HID support
+device		hidbus		# Generic HID bus
diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -118,12 +118,15 @@
 device		ehci			# EHCI USB interface (USB 2.0)
 device		xhci			# XHCI USB interface (USB 3.0)
 device		usb			# USB Bus (required)
+device		usbhid			# USB HID Transport
+device		hkbd			# Keyboard
 device		ukbd			# Keyboard
 device		umass			# Disks/Mass storage - Requires scbus and da
 
 # HID support
 options 	HID_DEBUG	# enable debug msgs
 device		hid		# Generic HID support
+device		hidbus		# Generic HID Bus
 
 # Serial (COM) ports
 device		uart		# Generic UART driver