3 files changed, 16 insertions, 2 deletions

diff --git a/docs/faq_build.md b/docs/faq_build.md
index 2d1b91b60..7d17df074 100644
--- a/docs/faq_build.md
+++ b/docs/faq_build.md
@@ -104,3 +104,17 @@ brew install dfu-programmer
 brew install gcc-arm-none-eabi
 brew install avrdude
 ```
+
+### avr-gcc 8.1 and LUFA
+
+If you updated your avr-gcc to above 7 you may see errors involving LUFA. For example:
+
+`lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h:380:5: error: 'const' attribute on function returning 'void'`
+
+For now, you need to rollback avr-gcc to 7 in brew.
+
+```
+brew uninstall --force avr-gcc
+brew install avr-gcc@7
+brew link avr-gcc@7
+```
diff --git a/docs/getting_started_build_tools.md b/docs/getting_started_build_tools.md
index 45b51b2cc..c1e02d4e0 100644
--- a/docs/getting_started_build_tools.md
+++ b/docs/getting_started_build_tools.md
@@ -56,7 +56,7 @@ If you're using [homebrew,](http://brew.sh/) you can use the following commands:
     brew tap osx-cross/avr
     brew tap PX4/homebrew-px4
     brew update
-    brew install avr-gcc
+    brew install avr-gcc@7
     brew install dfu-programmer
     brew install gcc-arm-none-eabi
     brew install avrdude
diff --git a/util/macos_install.sh b/util/macos_install.sh
index f53f26694..7bfb105ec 100755
--- a/util/macos_install.sh
+++ b/util/macos_install.sh
@@ -22,4 +22,4 @@ fi
 brew tap osx-cross/avr
 brew tap PX4/homebrew-px4
 brew update
-brew install avr-gcc gcc-arm-none-eabi dfu-programmer avrdude
+brew install avr-gcc@7 gcc-arm-none-eabi dfu-programmer avrdude