Index: boot/arch/amd64/Makefile.inc
===================================================================
--- boot/arch/amd64/Makefile.inc	(revision 1329dc0cfa673b0c8543f9c31a769ea91f26b150)
+++ boot/arch/amd64/Makefile.inc	(revision e6576355a3cebfb1925a5a55ba5aa821db40fac2)
@@ -35,9 +35,17 @@
 
 RD_DRVS_ESSENTIAL += \
-	audio/sb16 \
 	platform/pc \
 	block/ata_bd \
 	bus/pci/pciintel \
 	bus/isa \
+	audio/sb16 \
+	char/i8042 \
+	char/ps2mouse \
+	char/xtkbd
+
+RD_DRVS_NON_ESSENTIAL += \
+	audio/hdaudio \
+	char/ns8250 \
+	time/cmos-rtc \
 	bus/usb/ehci\
 	bus/usb/ohci \
@@ -48,13 +56,5 @@
 	bus/usb/usbmast \
 	bus/usb/usbmid \
-	bus/usb/vhc \
-	char/i8042 \
-	char/ps2mouse \
-	char/xtkbd
-
-RD_DRVS_NON_ESSENTIAL += \
-	audio/hdaudio \
-	char/ns8250 \
-	time/cmos-rtc
+	bus/usb/vhc
 
 RD_DRV_CFG += \
@@ -64,6 +64,5 @@
 	$(USPACE_PATH)/app/edit/edit \
 	$(USPACE_PATH)/app/mixerctl/mixerctl \
-	$(USPACE_PATH)/app/wavplay/wavplay \
-	$(USPACE_PATH)/app/usbinfo/usbinfo
+	$(USPACE_PATH)/app/wavplay/wavplay
 
 BOOT_OUTPUT = $(ROOT_PATH)/image.iso