diff --git a/.travis/osx..install.sh b/.travis/osx..install.sh
index 0fef97f864a..dfe1df4d1fb 100644
--- a/.travis/osx..install.sh
+++ b/.travis/osx..install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PACKAGES="cmake pkgconfig fftw libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio node fltk"
+PACKAGES="cmake pkgconfig fftw libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk fluid-synth portaudio node fltk carla"
 
 if [ $QT5 ]; then
 	PACKAGES="$PACKAGES qt5"
@@ -9,7 +9,5 @@ else
 fi
 
 brew install $PACKAGES ccache
-# FIXME: Move "carla" to $PACKAGES once https://github.com/Homebrew/homebrew-core/pull/31560 is merged
-brew install https://gist.githubusercontent.com/tresf/a8ffb8299227c51cf11aaf3929765264/raw/e94ad17aea63084c66bcb7e90009e3d5e848a467/carla.rb
 
 sudo npm install -g appdmg
diff --git a/plugins/carlabase/carla.cpp b/plugins/carlabase/carla.cpp
index 68d8c337622..935ae38cd6e 100644
--- a/plugins/carlabase/carla.cpp
+++ b/plugins/carlabase/carla.cpp
@@ -265,7 +265,7 @@ intptr_t CarlaInstrument::handleDispatcher(const NativeHostDispatcherOpcode opco
         qApp->processEvents();
         break;
     default:
-	break;
+        break;
     }
 
     return ret;
@@ -531,3 +531,4 @@ void CarlaInstrumentView::timerEvent(QTimerEvent* event)
 }
 
 // -------------------------------------------------------------------
+