diff --git a/.gitignore b/.gitignore
index 52203cdf..22fa6a59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,3 @@
 *.map
 *.sym
 *.eep
-LUFA/
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..4cdb4090
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "LUFA"]
+	path = LUFA
+	url = git@github.com:abcminiuser/lufa.git
diff --git a/LUFA b/LUFA
new file mode 160000
index 00000000..1e9148db
--- /dev/null
+++ b/LUFA
@@ -0,0 +1 @@
+Subproject commit 1e9148db894bca208d1076c291e85e134a2f3308
diff --git a/makefile b/makefile
index 26112d65..05053bd9 100755
--- a/makefile
+++ b/makefile
@@ -19,7 +19,7 @@ F_USB        = $(F_CPU)
 OPTIMIZATION = s
 TARGET       = Joystick
 SRC          = $(TARGET).c Descriptors.c image.c $(LUFA_SRC_USB)
-LUFA_PATH    = ../LUFA/LUFA
+LUFA_PATH    = LUFA/LUFA
 # Remove the -DZIG_ZAG_PRINTING below to compile with basic printing pattern (printing will take 30 m vs 25 m),
 # when this option is left enable, add also a -DSYNC_TO_30_FPS to save even more time (4 m). The last option is
 # still experimental, and sometimes breaks the pritning pattern