diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..37a3c9b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.o
+applet/
diff --git a/Makefile b/Makefile
index c59bcc3..3d17563 100644
--- a/Makefile
+++ b/Makefile
@@ -54,8 +54,12 @@ SOURCES = RDMHandlers.cpp RDMSender.cpp UsbProReceiver.cpp \
           UsbProSender.cpp WidgetSettings.cpp
 
 VERSION=1.0
-ARDUINO = $(INSTALL_DIR)/hardware/arduino/cores/arduino
-VARIANTS = $(INSTALL_DIR)/hardware/arduino/variants/standard
+# For earlier versions of Arduino, you may need to drop the /avr from the end
+# of this path
+ARDUINO_BASE = $(INSTALL_DIR)/hardware/arduino/avr
+ARDUINO = $(ARDUINO_BASE)/cores/arduino
+ARDUINO_CORE_LIB = $(ARDUINO_BASE)/libraries
+VARIANTS = $(ARDUINO_BASE)/variants/standard
 ARDUINO_LIB = $(INSTALL_DIR)/libraries
 AVR_TOOLS_PATH = $(INSTALL_DIR)/hardware/tools/avr/bin
 AVRDUDE_PATH = $(INSTALL_DIR)/hardware/tools/avr/bin
@@ -75,8 +79,9 @@ $(ARDUINO)/Tone.cpp \
 $(ARDUINO)/WMath.cpp \
 $(ARDUINO)/Print.cpp \
 $(ARDUINO)/HardwareSerial.cpp \
+$(ARDUINO)/HardwareSerial0.cpp \
 $(ARDUINO)/CDC.cpp \
-$(ARDUINO)/HID.cpp \
+$(ARDUINO_CORE_LIB)/HID/src/HID.cpp \
 $(ARDUINO)/IPAddress.cpp \
 $(ARDUINO)/new.cpp \
 $(ARDUINO)/Stream.cpp \
@@ -85,7 +90,6 @@ $(ARDUINO)/WMath.cpp \
 $(ARDUINO)/WString.cpp \
 $(ARDUINO)/main.cpp \
 $(SOURCES) \
-$(ARDUINO_LIB)/EEPROM/EEPROM.cpp \
 
 CXX_APP = main.cpp
 MODULES = $(C_MODULES) $(CXX_MODULES)
@@ -109,8 +113,8 @@ CDEFS = -DF_CPU=$(F_CPU)L -DARDUINO=$(VERSION)
 CXXDEFS = -DF_CPU=$(F_CPU)L -DARDUINO=$(VERSION)
 
 # Place -I options here
-CINCS = -I$(ARDUINO)  -I$(VARIANTS) -I$(ARDUINO_LIB)
-CXXINCS = -I$(ARDUINO) -I$(VARIANTS) -I$(ARDUINO_LIB)
+CINCS = -I$(ARDUINO)  -I$(VARIANTS) -I$(ARDUINO_CORE_LIB) -I$(ARDUINO_LIB)
+CXXINCS = -I$(ARDUINO) -I$(VARIANTS) -I$(ARDUINO_CORE_LIB) -I$(ARDUINO_LIB)
 
 # Compiler flag to set the C Standard level.
 # c89   - "ANSI" C
diff --git a/README b/README
index b116d42..26a6ce8 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 
 To build this software you need the Arduino build environment from
-http://arduino.cc/en/Main/Software. The last tested version was 0022.
+http://arduino.cc/en/Main/Software. The last tested version was 1.8.2.
 
 Edit the INSTALL_DIR variable in the Makefile to point at the Arduino
 installation directory. The software can then be built by running
diff --git a/WidgetSettings.cpp b/WidgetSettings.cpp
index 02741e5..33eda3d 100644
--- a/WidgetSettings.cpp
+++ b/WidgetSettings.cpp
@@ -29,7 +29,7 @@
  *   dmx personality (1)
  */
 
-#include "EEPROM/EEPROM.h"
+#include "EEPROM/src/EEPROM.h"
 #include "WidgetSettings.h"