diff --git a/repos/libports/lib/import/import-qemu-usb_include.mk b/repos/libports/lib/import/import-qemu-usb_include.mk
index a81e8e590d..a83f706edb 100644
--- a/repos/libports/lib/import/import-qemu-usb_include.mk
+++ b/repos/libports/lib/import/import-qemu-usb_include.mk
@@ -1,6 +1,6 @@
 QEMU_CONTRIB_DIR := $(call select_from_ports,qemu-usb)/src/lib/qemu
 
-LIB_DIR     := $(REP_DIR)/src/lib/qemu-usb
+LIB_DIR     := $(call select_from_repositories,src/lib/qemu-usb)
 LIB_INC_DIR := $(LIB_DIR)/include
 
 #
diff --git a/repos/libports/lib/mk/qemu-usb-webcam.inc b/repos/libports/lib/mk/qemu-usb-webcam.inc
new file mode 100644
index 0000000000..0e56d845b8
--- /dev/null
+++ b/repos/libports/lib/mk/qemu-usb-webcam.inc
@@ -0,0 +1,12 @@
+include $(REP_DIR)/lib/mk/qemu-usb.inc
+
+LIBS += libc
+LIBS += libyuv
+LIBS += format
+
+SRC_CC += webcam.cc
+SRC_C  += dev-webcam.c
+
+vpath dev-webcam.c $(LIB_DIR)
+
+SHARED_LIB = yes
diff --git a/repos/libports/lib/mk/qemu-usb.inc b/repos/libports/lib/mk/qemu-usb.inc
index b3249768d8..fc70da6af5 100644
--- a/repos/libports/lib/mk/qemu-usb.inc
+++ b/repos/libports/lib/mk/qemu-usb.inc
@@ -1,4 +1,4 @@
-LIB_DIR       = $(REP_DIR)/src/lib/qemu-usb
+LIB_DIR       = $(call select_from_repositories,src/lib/qemu-usb)
 QEMU_USB_DIR := $(call select_from_ports,qemu-usb)/src/lib/qemu/hw/usb
 
 CC_WARN=
@@ -6,20 +6,13 @@ CC_WARN=
 INC_DIR += $(LIB_DIR) $(QEMU_USB_DIR)
 
 LIBS  = qemu-usb_include
-LIBS += libc
-LIBS += libyuv
-LIBS += format
 
-SRC_CC = dummies.cc qemu_emul.cc host.cc webcam.cc
+SRC_CC += dummies.cc qemu_emul.cc host.cc
 
-SRC_C  = desc.c hcd-xhci.c hcd-xhci-pci.c core.c bus.c
-SRC_C += dev-webcam.c
-
-SHARED_LIB = yes
+SRC_C += desc.c hcd-xhci.c hcd-xhci-pci.c core.c bus.c
 
 LD_OPT += --version-script=$(LIB_DIR)/symbol.map
 
-vpath dev-webcam.c $(LIB_DIR)
 vpath %.c  $(QEMU_USB_DIR)
 vpath %.cc $(LIB_DIR)
 
diff --git a/repos/libports/lib/mk/spec/x86_32/qemu-usb.mk b/repos/libports/lib/mk/spec/x86_32/qemu-usb.mk
index 4af5253913..5b1cb91ef6 100644
--- a/repos/libports/lib/mk/spec/x86_32/qemu-usb.mk
+++ b/repos/libports/lib/mk/spec/x86_32/qemu-usb.mk
@@ -1 +1 @@
-include $(REP_DIR)/lib/mk/qemu-usb.inc
+include $(REP_DIR)/lib/mk/qemu-usb-webcam.inc
diff --git a/repos/libports/lib/mk/spec/x86_64/qemu-usb.mk b/repos/libports/lib/mk/spec/x86_64/qemu-usb.mk
index 4af5253913..5b1cb91ef6 100644
--- a/repos/libports/lib/mk/spec/x86_64/qemu-usb.mk
+++ b/repos/libports/lib/mk/spec/x86_64/qemu-usb.mk
@@ -1 +1 @@
-include $(REP_DIR)/lib/mk/qemu-usb.inc
+include $(REP_DIR)/lib/mk/qemu-usb-webcam.inc
diff --git a/repos/ports/recipes/src/vbox5-nova/content.mk b/repos/ports/recipes/src/vbox5-nova/content.mk
index e4bb050cad..e2aaab4aae 100644
--- a/repos/ports/recipes/src/vbox5-nova/content.mk
+++ b/repos/ports/recipes/src/vbox5-nova/content.mk
@@ -43,6 +43,7 @@ MIRROR_FROM_LIBPORTS := lib/mk/libc-mem.mk \
                         lib/import/import-qemu-usb_include.mk \
                         lib/mk/qemu-usb_include.mk \
                         lib/mk/qemu-usb.inc \
+                        lib/mk/qemu-usb-webcam.inc \
                         lib/mk/spec/x86_32/qemu-usb.mk \
                         lib/mk/spec/x86_64/qemu-usb.mk \
                         include/qemu \
diff --git a/repos/ports/recipes/src/vbox6/content.mk b/repos/ports/recipes/src/vbox6/content.mk
index d283e1c489..d133dd0fe5 100644
--- a/repos/ports/recipes/src/vbox6/content.mk
+++ b/repos/ports/recipes/src/vbox6/content.mk
@@ -35,6 +35,7 @@ MIRROR_FROM_LIBPORTS := \
 	lib/mk/libc-mem.mk \
 	lib/mk/qemu-usb.inc \
 	lib/mk/qemu-usb_include.mk \
+	lib/mk/qemu-usb-webcam.inc \
 	lib/mk/spec/x86_32/qemu-usb.mk \
 	lib/mk/spec/x86_64/qemu-usb.mk \
 	src/lib/libc/internal/init.h \