diff --git a/libgphoto2_port/usbscsi/linux.c b/libgphoto2_port/usbscsi/linux.c
index 0c9cb02c6..4b5286ff1 100644
--- a/libgphoto2_port/usbscsi/linux.c
+++ b/libgphoto2_port/usbscsi/linux.c
@@ -228,6 +228,13 @@ gp_port_library_list (GPPortInfoList *list)
 		CHECK (gp_port_info_list_append (list, info))
 	}
 	closedir (dir);
+
+        /* generic matcher. This will catch passed usbscsi: entries for instance. */
+        gp_port_info_new (&info);
+        gp_port_info_set_type (info, GP_PORT_USB_SCSI);
+        gp_port_info_set_name (info, "");
+        gp_port_info_set_path (info, "^usbscsi:");
+        CHECK (gp_port_info_list_append (list, info));
 	return GP_OK;
 }