diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..ef14eed
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libusbhsfs"]
+	path = libusbhsfs
+	url = https://github.com/DarkMatterCore/libusbhsfs
diff --git a/Makefile b/Makefile
index 4ac3d0a..b2fd0d9 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ LIBS	:= -lcurl -lmbedtls -lmbedx509 -lmbedcrypto -lxml2 -lz -lusbhsfs -lnx -ljso
 # list of directories containing libraries, this must be the top level containing
 # include and lib
 #---------------------------------------------------------------------------------
-LIBDIRS	:= $(PORTLIBS) $(LIBNX) $(CURDIR)/../libusbhsfs
+LIBDIRS	:= $(PORTLIBS) $(LIBNX) $(CURDIR)/libusbhsfs
 
 
 #---------------------------------------------------------------------------------
@@ -159,13 +159,17 @@ endif
 #---------------------------------------------------------------------------------
 all: $(BUILD)
 
-$(BUILD):
+usbhsfs:
+	@$(MAKE) --no-print-directory -C libusbhsfs release
+
+$(BUILD): usbhsfs
 	@[ -d $@ ] || mkdir -p $@
 	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
 
 #---------------------------------------------------------------------------------
 clean:
 	@echo clean ...
+	@$(MAKE) --no-print-directory -C libusbhsfs clean
 	@rm -fr $(BUILD) $(TARGET).pfs0 $(TARGET).nso $(TARGET).nro $(TARGET).nacp $(TARGET).elf
 
 
diff --git a/libusbhsfs b/libusbhsfs
new file mode 160000
index 0000000..156ab3d
--- /dev/null
+++ b/libusbhsfs
@@ -0,0 +1 @@
+Subproject commit 156ab3dff04351df57c338c0e4458eff8016d70b