diff --git a/Arduino.mk b/Arduino.mk
index ff94ffe..a27cdf1 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -817,6 +817,11 @@ ifeq ($(strip $(NO_CORE)),)
         endif
     endif
 
+    # some cores have a build.board
+    ifndef BUILD_BOARD
+        BUILD_BOARD = $(call PARSE_BOARD,$(BOARD_TAG),build.board)
+    endif
+
 endif
 
 # Everything gets built in here (include BOARD_TAG now)
@@ -1189,6 +1194,10 @@ ifneq ($(CATERINA),)
     endif
 endif
 
+ifneq ($(BUILD_BOARD),)
+    CPPFLAGS += -DARDUINO_$(BUILD_BOARD) "-DARDUINO_BOARD=\"$(BUILD_BOARD)\""
+endif
+
 # $(TOOL_PREFIX)-gcc version that we can do maths on
 CC_VERNUM = $(shell $(CC) -dumpversion | sed 's/\.//g')
 
diff --git a/HISTORY.md b/HISTORY.md
index 459858d..623a3bf 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -32,6 +32,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
 - New: Updated Arch instructions. (https://github.com/Akram-Chehaima)
 - New: Add support for Robotis OpenCR 1.0 boards.
 - New: Build the ArduinoCore API
+- New: Parse build.board from boards.txt and add to CPPFLAGS (https://github.com/sej7278)
 
 ### 1.6.0 (2017-07-11)
 - Fix: Allowed for SparkFun's weird usb pid/vid submenu shenanigans (issue #499). (https://github.com/sej7278)