diff --git a/README.md b/README.md
index 8dfd6f8..a55efbf 100644
--- a/README.md
+++ b/README.md
@@ -60,5 +60,5 @@ On other systems:
 
 In order to use Arduino libraries installed in the user's sketchbook folder (the
 standard location for custom libraries when using the Arduino IDE), you need to
-set the `ARDUNIO_SKETCHBOOK` variable to point to this directory. By default it
+set the `ARDUINO_SKETCHBOOK` variable to point to this directory. By default it
 is set to `$HOME/sketchbook`.
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
index 38d8217..315eddc 100644
--- a/arduino-mk/Arduino.mk
+++ b/arduino-mk/Arduino.mk
@@ -418,7 +418,9 @@ ISP_EXT_FUSE       = $(shell $(PARSE_BOARD_CMD) $(BOARD_TAG) bootloader.extended
 endif
 
 # Everything gets built in here
-OBJDIR  	  = build-cli
+ifndef OBJDIR
+OBJDIR  	  = build-$(BOARD_TAG)
+endif
 
 ########################################################################
 # Local sources