diff --git a/.travis.yml b/.travis.yml
index ec26741206..4e7a7b408b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -78,7 +78,7 @@ compiler: clang
 install:
   - make arm_sdk_install
 
-before_script: tools/gcc-arm-none-eabi-5_4-2016q2/bin/arm-none-eabi-gcc --version
+before_script: tools/gcc-arm-none-eabi-5_4-2016q3/bin/arm-none-eabi-gcc --version
 script: ./.travis.sh
 
 cache: apt
diff --git a/Makefile b/Makefile
index eb3a7cc281..7019238f80 100644
--- a/Makefile
+++ b/Makefile
@@ -37,9 +37,9 @@ SERIAL_DEVICE   ?= $(firstword $(wildcard /dev/ttyUSB*) no-port-found)
 # Flash size (KB).  Some low-end chips actually have more flash than advertised, use this to override.
 FLASH_SIZE ?=
 
-## Set verbosity level based on the V= parameter
-## V=0 Low
-## v=1 High
+## V                 : Set verbosity level based on the V= parameter
+##                     V=0 Low
+##                     V=1 High
 export AT := @
 
 ifndef V
@@ -67,7 +67,7 @@ INCLUDE_DIRS    = $(SRC_DIR) \
                   $(ROOT)/src/main/target
 LINKER_DIR      = $(ROOT)/src/main/target/link
 
-## Build tools, so we all share the same versions
+# Build tools, so we all share the same versions
 # import macros common to all supported build systems
 include $(ROOT)/make/system-id.mk
 # developer preferences, edit these at will, they'll be gitignored
@@ -902,7 +902,7 @@ cppcheck: $(CSOURCES)
 cppcheck-result.xml: $(CSOURCES)
 	$(V0) $(CPPCHECK) --xml-version=2 2> cppcheck-result.xml
 
-## mkdirs
+# mkdirs
 $(DL_DIR):
 	mkdir -p $@
 
@@ -913,7 +913,7 @@ $(BUILD_DIR):
 	mkdir -p $@
 
 ## help              : print this help message and exit
-help: Makefile
+help: Makefile make/tools.mk
 	$(V0) @echo ""
 	$(V0) @echo "Makefile for the $(FORKNAME) firmware"
 	$(V0) @echo ""
@@ -924,7 +924,7 @@ help: Makefile
 	$(V0) @echo ""
 	$(V0) @echo "Valid TARGET values are: $(VALID_TARGETS)"
 	$(V0) @echo ""
-	$(V0) @sed -n 's/^## //p' $<
+	$(V0) @sed -n 's/^## //p' $?
 
 ## targets           : print a list of all valid target platforms (for consumption by scripts)
 targets:
diff --git a/make/tools.mk b/make/tools.mk
index a12dc50a3c..8d0b24d145 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -14,23 +14,26 @@
 ##############################
 
 # Set up ARM (STM32) SDK
-ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-5_4-2016q2
+ARM_SDK_DIR := $(TOOLS_DIR)/gcc-arm-none-eabi-5_4-2016q3
 # Checked below, Should match the output of $(shell arm-none-eabi-gcc -dumpversion)
 GCC_REQUIRED_VERSION := 5.4.1
 
+## arm_sdk_install   : Install Arm SDK
 .PHONY: arm_sdk_install
 
+ARM_SDK_URL_BASE  := https://launchpad.net/gcc-arm-embedded/5.0/5-2016-q3-update/+download/gcc-arm-none-eabi-5_4-2016q3-20160926
+
 # source: https://launchpad.net/gcc-arm-embedded/5.0/
 ifdef LINUX
-  arm_sdk_install: ARM_SDK_URL  := https://launchpad.net/gcc-arm-embedded/5.0/5-2016-q2-update/+download/gcc-arm-none-eabi-5_4-2016q2-20160622-linux.tar.bz2
+  arm_sdk_install: ARM_SDK_URL  := $(ARM_SDK_URL_BASE)-linux.tar.bz2
 endif
 
 ifdef MACOSX
-  arm_sdk_install: ARM_SDK_URL  := https://launchpad.net/gcc-arm-embedded/5.0/5-2016-q2-update/+download/gcc-arm-none-eabi-5_4-2016q2-20160622-mac.tar.bz2
+  arm_sdk_install: ARM_SDK_URL  := $(ARM_SDK_URL_BASE)-mac.tar.bz2
 endif
 
 ifdef WINDOWS
-  arm_sdk_install: ARM_SDK_URL  := https://launchpad.net/gcc-arm-embedded/5.0/5-2016-q2-update/+download/gcc-arm-none-eabi-5_4-2016q2-20160622-win32.zip
+  arm_sdk_install: ARM_SDK_URL  := $(ARM_SDK_URL_BASE)-win32.zip
 endif
 
 arm_sdk_install: ARM_SDK_FILE := $(notdir $(ARM_SDK_URL))
@@ -48,6 +51,7 @@ else
 	$(V1) unzip -q -d $(ARM_SDK_DIR) "$(DL_DIR)/$(ARM_SDK_FILE)"
 endif
 
+## arm_sdk_clean     : Uninstall Arm SDK
 .PHONY: arm_sdk_clean
 arm_sdk_clean:
 	$(V1) [ ! -d "$(ARM_SDK_DIR)" ] || $(RM) -r $(ARM_SDK_DIR)