diff --git a/.gitmodules b/.gitmodules
index 17a20dec..e21f4496 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "protocol/usb_hid/USB_Host_Shield_2.0"]
-	path = protocol/usb_hid/USB_Host_Shield_2.0
-	url = git@github.com:tmk/USB_Host_Shield_2.0.git
 [submodule "protocol/lufa/LUFA-git"]
 	path = protocol/lufa/LUFA-git
 	url = https://github.com/abcminiuser/lufa.git
+[submodule "protocol/usb_hid/USB_Host_Shield_2.0"]
+	path = protocol/usb_hid/USB_Host_Shield_2.0
+	url = https://github.com/felis/USB_Host_Shield_2.0.git
diff --git a/protocol/usb_hid.mk b/protocol/usb_hid.mk
index 6914dce8..8fda76c2 100644
--- a/protocol/usb_hid.mk
+++ b/protocol/usb_hid.mk
@@ -8,6 +8,7 @@ USB_HOST_SHIELD_DIR = $(USB_HID_DIR)/USB_Host_Shield_2.0
 USB_HOST_SHIELD_SRC = \
 	$(USB_HOST_SHIELD_DIR)/Usb.cpp \
 	$(USB_HOST_SHIELD_DIR)/hid.cpp \
+	$(USB_HOST_SHIELD_DIR)/usbhub.cpp \
 	$(USB_HOST_SHIELD_DIR)/parsetools.cpp \
 	$(USB_HOST_SHIELD_DIR)/message.cpp 
 
diff --git a/protocol/usb_hid/USB_Host_Shield_2.0 b/protocol/usb_hid/USB_Host_Shield_2.0
index 8bb790f8..2b4a56de 160000
--- a/protocol/usb_hid/USB_Host_Shield_2.0
+++ b/protocol/usb_hid/USB_Host_Shield_2.0
@@ -1 +1 @@
-Subproject commit 8bb790f83af298b5f3e5516259c9d8ec27efe522
+Subproject commit 2b4a56de3d090686f62d25ea34042759dc4352d6