diff --git a/examples/testusbhostFAT/Makefile b/examples/testusbhostFAT/Makefile
index 232d338e..8a12ddc0 100644
--- a/examples/testusbhostFAT/Makefile
+++ b/examples/testusbhostFAT/Makefile
@@ -2,13 +2,16 @@
 # These are set for a mega 1280 + quadram plus my serial patch.
 # If you lack quadram, or want to disable LFN, just change _FS_TINY=1 _USE_LFN=0
 #
-# If your board is a mega 2560 uncomment the following two lines
-# BOARD = mega2560
-# PROGRAMMER = wiring
-# ...and then comment out the following two lines
+# If your board is a mega 2560 comment out the following two lines
 BOARD = mega
+
+BOARD_SUB = mega.menu.cpu.atmega1280
 PROGRAMMER = arduino
 
+# ...and then uncomment out the following two lines
+#BOARD_SUB = mega.menu.cpu.atmega2560
+#PROGRAMMER = wiring
+
 #BOARD = teensypp2
 #BOARD = teensy3
 #BOARD = teensy31
@@ -53,6 +56,9 @@ LIB_DIRS += ../testusbhostFAT/generic_storage
 LIB_DIRS += ../testusbhostFAT/RTClib
 LIB_DIRS += $(ARD_HOME)/libraries/Wire
 LIB_DIRS += $(ARD_HOME)/libraries/Wire/utility
+LIB_DIRS += $(ARD_HOME)/hardware/arduino/$(BUILD_ARCH)/libraries/Wire
+LIB_DIRS += $(ARD_HOME)/hardware/arduino/$(BUILD_ARCH)/libraries/Wire/utility
+LIB_DIRS += $(ARD_HOME)/hardware/arduino/$(BUILD_ARCH)/libraries/SPI
 
 # And finally, the part that brings everything together for you.
 include Arduino_Makefile_master/_Makefile.master