diff --git a/.gitmodules b/.gitmodules
index 74b8df2..ecc9201 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "arduino/Switch"]
 	path = arduino/Switch
 	url = https://github.com/blackketter/Switch.git
+[submodule "arduino/Arduino-Makefile"]
+	path = arduino/Arduino-Makefile
+	url = https://github.com/sudar/Arduino-Makefile.git
diff --git a/arduino/Arduino-Makefile b/arduino/Arduino-Makefile
new file mode 160000
index 0000000..8480373
--- /dev/null
+++ b/arduino/Arduino-Makefile
@@ -0,0 +1 @@
+Subproject commit 84803734779ddb4af0b8afb1f7de4c9d15771859
diff --git a/arduino/Makefile b/arduino/Makefile
index e51ec98..70e6e08 100644
--- a/arduino/Makefile
+++ b/arduino/Makefile
@@ -1,7 +1,12 @@
-BOARD_TAG    = nano328
+BOARD_TAG    = nano
+BOARD_SUB    = atmega328
+
 #ARDUINO_LIBS = LiquidCrystal
 ARDUINO_LIBS = StepperDriver Switch
 
-ARDMK_DIR:=$(HOME)/git/Arduino-Makefile
+ARDMK_DIR:=$(PWD)/Arduino-Makefile
+
+ARDUINO_DIR := $(HOME)/arduino/arduino-1.8.2
+USER_LIB_PATH := $(PWD)
 
 include $(ARDMK_DIR)/Arduino.mk