1 files changed, 9 insertions, 3 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 1d5c6d2..c8cd3b2 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -329,10 +329,16 @@ endif
 
 ifndef ARDUINO_SKETCHBOOK
     ifndef ARDUINO_PREFERENCES_PATH
+        ifeq ($(shell expr $(ARDUINO_VERSION) '>' 150), 1)
+            AUTO_ARDUINO_PREFERENCES := $(firstword \
+                $(call dir_if_exists,$(HOME)/.arduino15/preferences.txt) )
+                # TODO: add mac/windows version once known
+        else
+            AUTO_ARDUINO_PREFERENCES := $(firstword \
+                $(call dir_if_exists,$(HOME)/.arduino/preferences.txt) \
+                $(call dir_if_exists,$(HOME)/Library/Arduino/preferences.txt) )
+        endif
 
-        AUTO_ARDUINO_PREFERENCES := $(firstword \
-            $(call dir_if_exists,$(HOME)/.arduino/preferences.txt) \
-            $(call dir_if_exists,$(HOME)/Library/Arduino/preferences.txt) )
         ifdef AUTO_ARDUINO_PREFERENCES
            ARDUINO_PREFERENCES_PATH = $(AUTO_ARDUINO_PREFERENCES)
            $(call show_config_variable,ARDUINO_PREFERENCES_PATH,[AUTODETECTED])