Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision ef4b1126207083ec6bb1e9d3284ac63cca74f32c)
+++ uspace/Makefile	(revision b40bfac35889b2187b633463ec6137713aa555e9)
@@ -50,4 +50,6 @@
 	app/trace \
 	app/top \
+	app/usb \
+	app/virtusbkbd \
 	app/netstart \
 	app/netecho \
@@ -79,4 +81,5 @@
 	srv/hw/char/s3c24xx_uart \
 	srv/hw/netif/dp8390 \
+	srv/hw/bus/usb/hcd/virtual \
 	srv/net/cfg \
 	srv/net/netif/lo \
@@ -143,4 +146,14 @@
 	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))
 LIBS_BUILD = $(addsuffix .build,$(LIBS))