Index: uspace/drv/vhc/hub/hub.h
===================================================================
--- uspace/drv/vhc/hub/hub.h	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
+++ uspace/drv/vhc/hub/hub.h	(revision 679a135a8e85dc7aaa42ab4a8385e31cdf47ac24)
@@ -38,5 +38,7 @@
 #include <fibril_synch.h>
 
+#ifndef HUB_PORT_COUNT
 #define HUB_PORT_COUNT 2
+#endif
 #define BITS2BYTES(bits) (bits ? ((((bits)-1)>>3)+1) : 0)
 
Index: uspace/drv/vhc/hub/virthub.c
===================================================================
--- uspace/drv/vhc/hub/virthub.c	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
+++ uspace/drv/vhc/hub/virthub.c	(revision 679a135a8e85dc7aaa42ab4a8385e31cdf47ac24)
@@ -164,7 +164,13 @@
 	dev->device_data = hub;
 
-	usbvirt_connect_local(dev);
-
-	return EOK;
+	int rc;
+#ifdef STANDALONE_HUB
+	dev->name = "hub";
+	rc = usbvirt_connect(dev);
+#else
+	rc = usbvirt_connect_local(dev);
+#endif
+
+	return rc;
 }
 
Index: uspace/drv/vhc/hub/virthub.h
===================================================================
--- uspace/drv/vhc/hub/virthub.h	(revision bd8c753d552e6b0ff878d0bbc41a00ff515f345c)
+++ uspace/drv/vhc/hub/virthub.h	(revision 679a135a8e85dc7aaa42ab4a8385e31cdf47ac24)
@@ -37,6 +37,11 @@
 
 #include <usbvirt/device.h>
+#include "hub.h"
+
+#ifdef STANDALONE_HUB
+#define virtdev_connection_t int
+#else
 #include "../devices.h"
-#include "hub.h"
+#endif
 
 /** Endpoint number for status change pipe. */