diff --git a/.gitmodules b/.gitmodules
index c1c2a77..d94196e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,4 @@
 	url = https://github.com/google/googletest.git
 [submodule "external/midi-usb"]
 	path = external/midi-usb
-	url = https://github.com/arduino-libraries/MIDIUSB.git
+	url = https://github.com/FortySevenEffects/MIDIUSB.git
diff --git a/external/midi-usb b/external/midi-usb
index 1e2508d..8cbf89b 160000
--- a/external/midi-usb
+++ b/external/midi-usb
@@ -1 +1 @@
-Subproject commit 1e2508d529e9626efb1b006b3d80d6c20a191e38
+Subproject commit 8cbf89bdb94ab65db35c86038098c3ee5b22298d
diff --git a/test/unit-tests/CMakeLists.txt b/test/unit-tests/CMakeLists.txt
index a57b161..06dc4f9 100644
--- a/test/unit-tests/CMakeLists.txt
+++ b/test/unit-tests/CMakeLists.txt
@@ -6,6 +6,7 @@ include_directories(
     ${unit-tests_SOURCE_DIR}
     ${gtest_SOURCE_DIR}/include
     ${gmock_SOURCE_DIR}/include
+    "../../external/midi-usb/src"
 )
 
 add_executable(unit-tests