diff --git a/Arduino.mk b/Arduino.mk
index d4fe5cc1..cc156fc9 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -688,6 +688,9 @@ endif
 # Everything gets built in here (include BOARD_TAG now)
 ifndef OBJDIR
     OBJDIR = build-$(BOARD_TAG)
+    ifdef BOARD_SUB
+        OBJDIR = build-$(BOARD_TAG)-$(BOARD_SUB)
+    endif
     $(call show_config_variable,OBJDIR,[COMPUTED],(from BOARD_TAG))
 else
     $(call show_config_variable,OBJDIR,[USER])
diff --git a/HISTORY.md b/HISTORY.md
index 0a734931..dd55e655 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -29,6 +29,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
 - Tweak: Replace CXX_NAME with CXX as per the Emacs Flymake Wiki (Issue #309) (https://github.com/sej7278)
 - Tweak: Ability to override `USB_TYPE` in Teensy.md (Issue #313) (https://github.com/Poofjunior)
 - Tweak: Integration instructions for CodeBlocks IDE (Issue #321) (https://github.com/fbielejec)
+- Tweak: Add BOARD_SUB to OBJDIR if defined in 1.5+ (https://github.com/sej7278)
 
 - Fix: Improved Windows (Cygwin/MSYS) support (https://github.com/PeterMosmans)
 - Fix: Change "tinyladi" username to "ladislas" in HISTORY.md. (https://github.com/ladislas)