Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision d362410ce59dce2a66aea08b1f4b52dec1056dba)
+++ uspace/Makefile	(revision 49ba19d775ef52a1cf9c4638199d84fc18fda634)
@@ -41,4 +41,5 @@
 	app/killall \
 	app/klog \
+	app/lsusb \
 	app/mkfat \
 	app/redir \
@@ -50,4 +51,6 @@
 	app/trace \
 	app/top \
+	app/usbinfo \
+	app/vuhid \
 	app/netecho \
 	app/nettest1 \
@@ -56,4 +59,5 @@
 	app/websrv \
 	app/sysinfo \
+	app/mkbd \
 	srv/clip \
 	srv/devmap \
@@ -114,5 +118,16 @@
 		drv/ns8250 \
 		srv/hw/irc/apic \
-		srv/hw/irc/i8259
+		srv/hw/irc/i8259 \
+		drv/ehci-hcd \
+		drv/ohci \
+		drv/uhci-hcd \
+		drv/uhci-rhd \
+		drv/usbflbk \
+		drv/usbhid \
+		drv/usbhub \
+		drv/usbmast \
+		drv/usbmid \
+		drv/usbmouse \
+		drv/vhc
 endif
 
@@ -124,5 +139,16 @@
 		drv/ns8250 \
 		srv/hw/irc/apic \
-		srv/hw/irc/i8259
+		srv/hw/irc/i8259 \
+		drv/ehci-hcd \
+		drv/ohci \
+		drv/uhci-hcd \
+		drv/uhci-rhd \
+		drv/usbflbk \
+		drv/usbhid \
+		drv/usbhub \
+		drv/usbmast \
+		drv/usbmid \
+		drv/usbmouse \
+		drv/vhc
 endif
 
@@ -151,4 +177,20 @@
 	lib/net
 
+ifeq ($(UARCH),amd64)
+	LIBS += lib/usb
+	LIBS += lib/usbhost
+	LIBS += lib/usbdev
+	LIBS += lib/usbhid
+	LIBS += lib/usbvirt
+endif
+
+ifeq ($(UARCH),ia32)
+	LIBS += lib/usb
+	LIBS += lib/usbhost
+	LIBS += lib/usbdev
+	LIBS += lib/usbhid
+	LIBS += lib/usbvirt
+endif
+
 LIBC_BUILD = $(addsuffix .build,$(LIBC))
 LIBS_BUILD = $(addsuffix .build,$(LIBS))