diff --git a/.travis.yml b/.travis.yml
index 2aafe4fd5..6908fe6f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ env:
   global:
     - PROTOBUF_VERSION=3.4.0
   matrix:
-    - GOAL=stm32 TOOLCHAIN_SHORTVER=7-2017q4 TOOLCHAIN_LONGVER=gcc-arm-none-eabi-7-2017-q4-major
+    - GOAL=stm32 TOOLCHAIN_SHORTVER=7-2018q2 TOOLCHAIN_LONGVER=gcc-arm-none-eabi-7-2018-q2-update
     - GOAL=unix
     - GOAL=src
 
diff --git a/Dockerfile b/Dockerfile
index 3788ad736..da649d174 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,8 @@ RUN apt-get update && apt-get install -y \
 
 # download toolchain
 
-ENV TOOLCHAIN_SHORTVER=7-2017q4
-ENV TOOLCHAIN_LONGVER=gcc-arm-none-eabi-7-2017-q4-major
+ENV TOOLCHAIN_SHORTVER=7-2018q2
+ENV TOOLCHAIN_LONGVER=gcc-arm-none-eabi-7-2018-q2-update
 ENV TOOLCHAIN_FLAVOR=linux
 ENV TOOLCHAIN_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/$TOOLCHAIN_SHORTVER/$TOOLCHAIN_LONGVER-$TOOLCHAIN_FLAVOR.tar.bz2
 
diff --git a/Dockerfile.gcc_source b/Dockerfile.gcc_source
index 5ec2b3937..dddc54201 100644
--- a/Dockerfile.gcc_source
+++ b/Dockerfile.gcc_source
@@ -11,8 +11,8 @@ RUN apt-get update && apt-get install -y \
 
 # download toolchain
 
-ENV TOOLCHAIN_SHORTVER=7-2017q4
-ENV TOOLCHAIN_LONGVER=gcc-arm-none-eabi-7-2017-q4-major
+ENV TOOLCHAIN_SHORTVER=7-2018q2
+ENV TOOLCHAIN_LONGVER=gcc-arm-none-eabi-7-2018-q2-update
 ENV TOOLCHAIN_FLAVOR=src
 ENV TOOLCHAIN_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/$TOOLCHAIN_SHORTVER/$TOOLCHAIN_LONGVER-$TOOLCHAIN_FLAVOR.tar.bz2
 
diff --git a/docs/build.md b/docs/build.md
index bdde2e3ac..84b7961ec 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -76,7 +76,7 @@ sudo apt-get install scons gcc-arm-none-eabi libnewlib-arm-none-eabi
 
 #### OS X
 
-1. Download [gcc-arm-none-eabi](https://launchpad.net/gcc-arm-embedded/5.0/5-2016-q3-update/)
+1. Download [gcc-arm-none-eabi](https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads)
 2. Follow the [install instructions](https://launchpadlibrarian.net/287100883/readme.txt)
 3. To install OpenOCD, run `brew install open-ocd`
 4. Run `make vendor build_boardloader build_bootloader build_firmware`