Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision acc7ce4f9be635e9051884b563142089f38803c4)
+++ uspace/Makefile	(revision 2e383854eddafb63699d4e88b0c6d753f37813d2)
@@ -51,4 +51,6 @@
 	app/trace \
 	app/top \
+	app/usbinfo \
+	app/virtusbkbd \
 	app/netecho \
 	app/nettest1 \
@@ -114,5 +116,9 @@
 		drv/ns8250 \
 		srv/hw/irc/apic \
-		srv/hw/irc/i8259
+		srv/hw/irc/i8259 \
+		drv/uhci \
+		drv/usbhub \
+		drv/usbkbd \
+		drv/vhc
 endif
 
@@ -124,5 +130,9 @@
 		drv/ns8250 \
 		srv/hw/irc/apic \
-		srv/hw/irc/i8259
+		srv/hw/irc/i8259 \
+		drv/uhci \
+		drv/usbhub \
+		drv/usbkbd \
+		drv/vhc
 endif
 
@@ -150,4 +160,14 @@
 	lib/packet \
 	lib/net
+
+ifeq ($(UARCH),amd64)
+	LIBS += lib/usb
+	LIBS += lib/usbvirt
+endif
+
+ifeq ($(UARCH),ia32)
+	LIBS += lib/usb
+	LIBS += lib/usbvirt
+endif
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))