diff --git a/.travis.yml b/.travis.yml
index 7cee0156..20d536d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ matrix:
 
     - os: osx
       compiler: clang
+      osx_image: xcode10.3
 
 env:
   global:
@@ -30,10 +31,10 @@ addons:
       - python-yaml
 
   homebrew:
-    taps: PX4/homebrew-px4
+    taps: armmbed/formulae
     packages:
        - fftw
-       - gcc-arm-none-eabi
+       - arm-none-eabi-gcc
        - dfu-util
 
 before_install:
diff --git a/host/hackrf-tools/src/CMakeLists.txt b/host/hackrf-tools/src/CMakeLists.txt
index ee2dbb94..7115151c 100644
--- a/host/hackrf-tools/src/CMakeLists.txt
+++ b/host/hackrf-tools/src/CMakeLists.txt
@@ -24,7 +24,8 @@
 set(INSTALL_DEFAULT_BINDIR "bin" CACHE STRING "Appended to CMAKE_INSTALL_PREFIX")
 
 find_package(FFTW REQUIRED)
-include_directories(${FFTW_INCLUDE_DIRS})
+include_directories(${FFTW_INCLUDES})
+get_filename_component(FFTW_LIBRARY_DIRS ${FFTW_LIBRARIES} DIRECTORY)
 link_directories(${FFTW_LIBRARY_DIRS})
 
 SET(TOOLS